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>

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
index 7d3ebb9..3686a51 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
@@ -20,6 +20,8 @@
 
 package org.openecomp.sdc.translator.datatypes.heattotosca;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.openecomp.config.api.Configuration;
 import org.openecomp.config.api.ConfigurationManager;
 import org.openecomp.core.utilities.CommonMethods;
@@ -365,6 +367,19 @@ public class TranslationContext {
     this.usedHeatPseudoParams.get(heatFileName).put(heatPseudoParam, translatedToscaParam);
   }
 
+  public Set<String> getTranslatedResourceIdsFromOtherFiles(String fileNameToIgnore){
+    if(MapUtils.isEmpty(this.translatedResources)){
+      return new HashSet<>();
+    }
+
+    Set<String> translatedResourceIds = new HashSet<>();
+
+    this.translatedResources.entrySet().stream().filter(entry -> !entry.getKey().equals(fileNameToIgnore))
+        .forEach(entry -> translatedResourceIds.addAll(entry.getValue()));
+
+    return translatedResourceIds;
+  }
+
   /**
    * Add the unified substitution data info in context. Contains a mapping of original node
    * template id and the new node template id in the abstract substitute

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java
index cebabc0..72739d3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationBase.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslati
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.openecomp.sdc.common.errors.CoreException;
+import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
@@ -44,6 +45,7 @@ import org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil;
 import org.openecomp.sdc.translator.services.heattotosca.ConsolidationEntityType;
 import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
 import org.openecomp.sdc.translator.services.heattotosca.ResourceTranslationFactory;
+import org.openecomp.sdc.translator.services.heattotosca.errors.DuplicateResourceIdsInDifferentFilesErrorBuilder;
 import org.openecomp.sdc.translator.services.heattotosca.errors.ResourceNotFoundInHeatFileErrorBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +57,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -85,6 +88,11 @@ public abstract class ResourceTranslationBase {
     Optional<String> translatedId =
         getResourceTranslatedId(heatFileName, heatOrchestrationTemplate, resourceId, context);
     context.getTranslatedResources().putIfAbsent(heatFileName, new HashSet<>());
+
+    if(isResourceWithSameIdAppearsInOtherFiles(heatFileName, resourceId, context)){
+      throw new CoreException(
+          new DuplicateResourceIdsInDifferentFilesErrorBuilder(resourceId).build());
+    }
     if (context.getTranslatedResources().get(heatFileName).contains(resourceId)) {
       return translatedId;
     }
@@ -110,6 +118,16 @@ public abstract class ResourceTranslationBase {
     return translatedId;
   }
 
+  private boolean isResourceWithSameIdAppearsInOtherFiles(String heatFileName,
+                                                          String resourceId,
+                                                          TranslationContext context){
+    Set<String> translatedResourceIdsFromOtherFiles =
+        context.getTranslatedResourceIdsFromOtherFiles(heatFileName);
+
+    return CollectionUtils.isNotEmpty(translatedResourceIdsFromOtherFiles)
+        && translatedResourceIdsFromOtherFiles.contains(resourceId);
+  }
+
   /**
    * Gets resource translated id.
    *

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
index 53dd79e..dd48e61 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
@@ -925,7 +925,7 @@ public class ConsolidationDataTestUtil {
           nestedNodeTemplateId);
       Assert.assertNull(nestedTemplateConsolidationData.getNodesConnectedIn());
       //Validate output parameter get attribute in
-      getAttrFuncData = nestedTemplateConsolidationData.getNodesGetAttrIn().get("server_cmaui");
+      getAttrFuncData = nestedTemplateConsolidationData.getNodesGetAttrIn().get("server_cmaui_1");
       Assert.assertNotNull(getAttrFuncData);
       Assert.assertEquals(getAttrFuncData.size(), 1);
       Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "metadata");

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f8f5764..0c8f667 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -81,14 +81,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_server_pcm_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
+    - local_storage_server_pcm_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -115,31 +115,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
-        type: org.openecomp.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_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_1:
+      disk.root.size_server_pcm_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_pcm:
+      network.outpoing.packets_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      disk.iops_server_pcm_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:
@@ -151,73 +145,61 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_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.resident_server_pcm:
+      disk.usage_server_pcm_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_pcm:
+      disk.capacity_server_pcm_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_pcm:
+      disk.write.requests_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
+      disk.read.bytes_server_pcm_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_pcm:
-        type: org.openecomp.capabilities.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_pcm:
-        type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      network.incoming.bytes_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
+      cpu_util_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      vcpus_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      memory.resident_server_pcm_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:
@@ -237,42 +219,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      memory.usage_server_pcm:
+      cpu_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pcm:
+      network.outgoing.packets.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      network.outgoing.packets.rate_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      feature_server_pcm_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.write.bytes_server_pcm_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.packets.rate_pcm_port_0:
+      disk.device.iops_server_pcm_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.packets.rate_pcm_port_1:
+      disk.allocation_server_pcm_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:
@@ -289,12 +271,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
-        type: org.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_pcm_port_0:
         type: tosca.capabilities.Node
         occurrences:
@@ -316,84 +292,96 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_pcm_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_pcm:
+      disk.device.read.bytes_server_pcm_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_pcm:
-        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_pcm_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_server_pcm_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      disk.read.bytes.rate_server_pcm_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_pcm:
+      disk.device.capacity_server_pcm_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.rate_server_pcm:
+      cpu.delta_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.device.write.requests.rate_server_pcm_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_pcm:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_pcm_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_pcm:
+      disk.ephemeral.size_server_pcm_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_pcm:
+      disk.latency_server_pcm_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_pcm:
+      disk.write.requests.rate_server_pcm_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_pcm:
+      scalable_server_pcm_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory_server_pcm_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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.read.bytes.rate_server_pcm_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.delta_server_pcm:
+      disk.device.latency_server_pcm_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:
@@ -405,14 +393,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.usage_server_pcm_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
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.packets_pcm_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -422,7 +411,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.device.write.requests_server_pcm_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:
@@ -434,32 +423,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.write.bytes_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
-        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_pcm_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      instance_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      disk.device.read.requests.rate_server_pcm_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
@@ -469,18 +458,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcm:
+      disk.write.bytes.rate_server_pcm_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
+      binding_server_pcm_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.allocation_server_pcm_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
   org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -555,414 +555,414 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.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_pcm:
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_0:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      cpu_util_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pcm:
+      memory.resident_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      network.outgoing.bytes_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
+      feature_server_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.allocation_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      disk.device.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      memory.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      cpu_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.incoming.bytes.rate_pcm_port_00:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      disk.device.read.bytes_server_pcm_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_pcm_port_1:
+      network.incoming.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      endpoint_server_pcm_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.read.bytes.rate_server_pcm_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
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.iops_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      cpu.delta_server_pcm_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_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      disk.device.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      disk.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.device.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.ephemeral.size_server_pcm_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
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.latency_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      memory_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_0:
+      disk.device.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.device.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.device.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.device.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_00:
         type: org.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_pcm:
-        type: tosca.capabilities.Node
+      binding_server_pcm_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      disk.device.allocation_server_pcm_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:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index f0fffa1..7e74985 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -90,7 +90,7 @@ topology_template:
       type: string
       description: OAM network name
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -103,32 +103,19 @@ topology_template:
         - get_input: security_group_name
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: oam
+        network_role_tag: cps
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -141,18 +128,31 @@ topology_template:
         - get_input: security_group_name
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: cps
+        network_role_tag: oam
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
+    server_pcm_1:
+      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
   groups:
     nested-pcm_v0.1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -160,221 +160,221 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
-      - server_pcm
-      - pcm_port_0
+      - pcm_port_00
+      - pcm_port_01
+      - server_pcm_1
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
+      disk.root.size_server_pcm_1:
+      - server_pcm_1
       - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
+      disk.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.iops
+      disk.device.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes.rate
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
       - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
       - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
+      disk.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
+      disk.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests
+      disk.read.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
       - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
+      disk.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.usage
+      cpu_util_server_pcm_1:
+      - server_pcm_1
+      - cpu_util
+      vcpus_server_pcm_1:
+      - server_pcm_1
+      - vcpus
+      memory.resident_server_pcm_1:
+      - server_pcm_1
+      - memory.resident
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
+      feature_server_pcm_1:
+      - server_pcm_1
       - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      disk.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.allocation
+      disk.device.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes
+      memory.usage_server_pcm_1:
+      - server_pcm_1
+      - memory.usage
+      cpu_server_pcm_1:
+      - server_pcm_1
+      - cpu
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
+      disk.device.read.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
+      endpoint_server_pcm_1:
+      - server_pcm_1
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
+      disk.device.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.device.iops
+      cpu.delta_server_pcm_1:
+      - server_pcm_1
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
-      - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
+      host_server_pcm_1:
+      - server_pcm_1
+      - host
+      disk.device.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
-      - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
+      disk.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_1:
+      - server_pcm_1
       - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
+      disk.ephemeral.size_server_pcm_1:
+      - server_pcm_1
+      - disk.ephemeral.size
+      disk.latency_server_pcm_1:
+      - server_pcm_1
       - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
+      scalable_server_pcm_1:
+      - server_pcm_1
+      - scalable
+      disk.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
+      memory_server_pcm_1:
+      - server_pcm_1
+      - memory
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
+      disk.device.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.device.latency
+      disk.device.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes.rate
+      disk.device.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.device.usage
+      disk.device.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests
+      disk.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.write.bytes
+      disk.device.read.requests_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      instance_server_pcm_1:
+      - server_pcm_1
+      - instance
+      disk.device.read.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests.rate
+      os_server_pcm_1:
+      - server_pcm_1
+      - os
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
+      binding_server_pcm_1:
+      - server_pcm_1
+      - binding
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
+      disk.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      disk.device.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.device.allocation
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
-      dependency_server_pcm:
-      - server_pcm
+      dependency_server_pcm_1:
+      - server_pcm_1
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
\ No newline at end of file
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
+      local_storage_server_pcm_1:
+      - server_pcm_1
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
index 8aa225d..b373c12 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
@@ -99,9 +99,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_2
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
+    server_pcm_2:
       type: org.openecomp.resource.vfc.nodes.heat.pcm_server
       properties:
         flavor:
@@ -137,7 +137,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_2
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested-pcm_v0.1_2_group:
@@ -147,108 +147,96 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - pcm_port_1
-      - server_pcm
+      - server_pcm_2
       - pcm_port_0
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_2
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2
     capabilities:
       network.incoming.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
       network.incoming.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets.rate
+      disk.root.size_server_pcm_2:
+      - server_pcm_2
+      - disk.root.size
       network.outpoing.packets_pcm_port_1:
       - pcm_port_1
       - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
+      disk.iops_server_pcm_2:
+      - server_pcm_2
+      - disk.iops
       network.outpoing.packets_pcm_port_0:
       - pcm_port_0
       - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
+      disk.device.write.bytes.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.bytes.rate
+      disk.usage_server_pcm_2:
+      - server_pcm_2
       - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
-      - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
+      disk.capacity_server_pcm_2:
+      - server_pcm_2
+      - disk.capacity
+      disk.write.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.write.requests
+      disk.read.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.read.bytes
       network.incoming.bytes_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes
       network.incoming.bytes_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes
+      cpu_util_server_pcm_2:
+      - server_pcm_2
+      - cpu_util
+      vcpus_server_pcm_2:
+      - server_pcm_2
+      - vcpus
+      memory.resident_server_pcm_2:
+      - server_pcm_2
+      - memory.resident
       binding_pcm_port_0:
       - pcm_port_0
       - binding
       binding_pcm_port_1:
       - pcm_port_1
       - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
-      - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
-      - disk.read.bytes
+      cpu_server_pcm_2:
+      - server_pcm_2
+      - cpu
       network.outgoing.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.packets.rate
       network.outgoing.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.packets.rate
+      feature_server_pcm_2:
+      - server_pcm_2
+      - feature
+      disk.device.write.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.bytes
+      disk.device.iops_server_pcm_2:
+      - server_pcm_2
+      - disk.device.iops
+      disk.allocation_server_pcm_2:
+      - server_pcm_2
+      - disk.allocation
       feature_pcm_port_1:
       - pcm_port_1
       - feature
       network.outgoing.bytes_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
       feature_pcm_port_0:
       - pcm_port_0
       - feature
@@ -261,90 +249,102 @@ topology_template:
       attachment_pcm_port_1:
       - pcm_port_1
       - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      memory.usage_server_pcm_2:
+      - server_pcm_2
+      - memory.usage
+      disk.device.read.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.device.read.bytes
+      host_server_pcm_2:
+      - server_pcm_2
+      - host
+      endpoint_server_pcm_2:
+      - server_pcm_2
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_2:
+      - server_pcm_2
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
+      disk.device.capacity_server_pcm_2:
+      - server_pcm_2
+      - disk.device.capacity
+      cpu.delta_server_pcm_2:
+      - server_pcm_2
+      - cpu.delta
+      disk.device.write.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.read.requests
+      disk.ephemeral.size_server_pcm_2:
+      - server_pcm_2
+      - disk.ephemeral.size
+      disk.latency_server_pcm_2:
+      - server_pcm_2
+      - disk.latency
+      disk.write.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.write.requests.rate
+      scalable_server_pcm_2:
+      - server_pcm_2
       - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
+      memory_server_pcm_2:
+      - server_pcm_2
+      - memory
+      disk.device.read.bytes.rate_server_pcm_2:
+      - server_pcm_2
       - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
-      - cpu.delta
+      disk.device.latency_server_pcm_2:
+      - server_pcm_2
+      - disk.device.latency
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
+      disk.device.usage_server_pcm_2:
+      - server_pcm_2
+      - disk.device.usage
       network.incoming.packets_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
-      - binding
       network.outgoing.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
-      - disk.device.capacity
+      disk.device.write.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.requests
       network.incoming.packets_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
+      disk.write.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.write.bytes
+      os_server_pcm_2:
+      - server_pcm_2
+      - os
+      instance_server_pcm_2:
+      - server_pcm_2
       - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
-      - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      disk.device.read.requests_server_pcm_2:
+      - server_pcm_2
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
+      disk.device.read.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.read.requests.rate
       network.incoming.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      disk.write.bytes.rate_server_pcm_2:
+      - server_pcm_2
       - disk.write.bytes.rate
+      binding_server_pcm_2:
+      - server_pcm_2
+      - binding
       network.incoming.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes.rate
+      disk.device.allocation_server_pcm_2:
+      - server_pcm_2
+      - disk.device.allocation
     requirements:
       link_pcm_port_0:
       - pcm_port_0
@@ -352,15 +352,15 @@ topology_template:
       link_pcm_port_1:
       - pcm_port_1
       - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
+      dependency_server_pcm_2:
+      - server_pcm_2
+      - dependency
       dependency_pcm_port_0:
       - pcm_port_0
       - dependency
-      dependency_server_pcm:
-      - server_pcm
-      - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
\ No newline at end of file
+      - dependency
+      local_storage_server_pcm_2:
+      - server_pcm_2
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
index 109bf86..4769537 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
@@ -68,7 +68,7 @@ resources:
       - config: { get_resource: network}
       - config: { get_resource: script_init}
 
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -77,8 +77,8 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
@@ -86,7 +86,7 @@ resources:
       user_data:
         get_resource: server_init
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -94,21 +94,14 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
       fixed_ips:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
-
-  #pcm_vol_attachment:
-  #  type: OS:: Cinder::VolumeAttachment
-  #  properties:
-  #    volume_id: { get_param: pcm_vol }
-  #    mountpoint: /dev/vdb
-  #    instance_uuid: { get_resource: server_pcm }
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
index 3f117a8..fe545e9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
@@ -74,7 +74,7 @@ resources:
       - config: { get_resource: network}
       - config: { get_resource: script_init}
 
-  server_pcm:
+  server_pcm_2:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -107,14 +107,7 @@ resources:
       fixed_ips:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
-
-  #pcm_vol_attachment:
-  #  type: OS:: Cinder::VolumeAttachment
-  #  properties:
-  #    volume_id: { get_param: pcm_vol }
-  #    mountpoint: /dev/vdb
-  #    instance_uuid: { get_resource: server_pcm }
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_2 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f2dee50..59633ba 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,67 +68,67 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_test_nested2:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_11_test_nested2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    - local_storage_server_cmaui_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_22_test_nested2:
+    - dependency_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui_test_nested2:
+    - dependency_server_cmaui_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2:
+    - local_storage_server_cmaui_2_test_nested2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_11_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_11_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_cmaui_port_22_test_nested2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - link_cmaui_port_22_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -143,144 +143,163 @@ node_types:
         - 1
         - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_22_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_22_test_nested2:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      host_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2:
+      binding_cmaui_port_11_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.iops_server_cmaui_2_test_nested2:
         type: org.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
+      network.outgoing.bytes_cmaui_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_11_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.bytes_cmaui_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.iops_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2:
+      disk.allocation_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_11_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11_test_nested2:
+      cpu_server_cmaui_2_test_nested2:
         type: org.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.read.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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.read.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.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_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
+      endpoint_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_22_test_nested2:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -288,29 +307,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested2:
-        type: tosca.capabilities.network.Bindable
+      cpu.delta_server_cmaui_2_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      instance_server_cmaui_2_test_nested2:
         type: org.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      memory.usage_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.write.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -322,47 +349,71 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2:
+      disk.device.write.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22_test_nested2:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2:
+      disk.capacity_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_11_test_nested2:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested2:
-        type: tosca.capabilities.OperatingSystem
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_22_test_nested2:
-        type: tosca.capabilities.Node
+      disk.latency_server_cmaui_2_test_nested2:
+        type: org.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_nested2:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2:
         type: org.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:
+      network.outpoing.packets_cmaui_port_11_test_nested2:
+        type: org.openecomp.capabilities.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_2_test_nested2:
+        type: org.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_2_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      os_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_22_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
@@ -381,25 +432,25 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested2:
+      disk.ephemeral.size_server_cmaui_2_test_nested2:
         type: org.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_nested2:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      vcpus_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -411,13 +462,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested2:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -441,50 +492,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_cmaui_test_nested2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes_cmaui_port_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:
+      network.incoming.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -502,12 +528,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -520,12 +540,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_cmaui_port_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -536,146 +550,136 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested2:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11_test_nested2:
+      cpu_util_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      disk.device.iops_server_cmaui_2_test_nested2:
+        type: org.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_nested2:
-        type: tosca.capabilities.Scalable
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_11_test_nested2:
         type: org.openecomp.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.
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_22_test_nested2:
-        type: tosca.capabilities.Attachment
+      feature_test_nested2:
+        type: tosca.capabilities.Node
         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_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_22_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.outgoing.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2:
+      network.outgoing.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.write.requests_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory_server_cmaui_test_nested2:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2:
         type: org.openecomp.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2:
+      disk.device.capacity_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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:
+      memory.resident_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      disk.usage_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -687,161 +691,156 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested2:
-        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_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested2:
-        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_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      memory_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.write.requests_server_cmaui_2_test_nested2:
         type: org.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_nested2:
-        type: tosca.capabilities.Node
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_11_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      disk.read.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      network.outgoing.bytes_cmaui_port_22_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11_test_nested2:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2:
+      disk.device.latency_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22_test_nested2:
+      disk.device.allocation_server_cmaui_2_test_nested2:
         type: org.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:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
+      network.incoming.bytes.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      disk.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2:
+      network.outpoing.packets_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      network.outpoing.packets_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      disk.write.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -859,23 +858,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested2:
+      network.outpoing.packets_cmaui_port_22_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_22_test_nested2:
+      memory.resident_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_cmaui_port_11_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
@@ -886,7 +880,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2:
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -938,6 +938,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_cmaui_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -964,34 +978,20 @@ 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:
-      cpu.delta_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.device.write.requests.rate_server_cmaui:
+      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
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1016,103 +1016,94 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.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
-      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.
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      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.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:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         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
-      network.incoming.packets.rate_cmaui_port_22:
+      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.latency_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      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.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.
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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:
+      network.outgoing.bytes.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_22:
+      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.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.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:
@@ -1124,27 +1115,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_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_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
-        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
@@ -1153,7 +1142,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_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:
@@ -1165,35 +1154,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.write.requests.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      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.write.bytes_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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
+      network.outgoing.bytes.rate_cmaui_port_11:
+        type: org.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_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_11:
+      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:
@@ -1221,13 +1225,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22:
+      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
-      memory.resident_server_cmaui:
+      network.incoming.packets_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1239,61 +1243,56 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_11:
         type: org.openecomp.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:
+      binding_cmaui_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11:
+      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
-      binding_cmaui_port_11:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_cmaui:
+      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
-      disk.ephemeral.size_server_cmaui:
+      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:
@@ -1310,42 +1309,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.outgoing.bytes_cmaui_port_22:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22:
+      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.iops_server_cmaui:
+      network.incoming.packets_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_11:
+      network.incoming.bytes_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_11:
+      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.read.bytes_server_cmaui:
+      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:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
index 2f611eb..43b1696 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
@@ -55,6 +55,19 @@ 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
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -81,7 +94,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     cmaui_port_22:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -108,21 +121,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
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2level_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -130,21 +130,21 @@ topology_template:
         heat_file: ../Artifacts/nested2level.yml
         description: cmaui server template for vMMSC
       members:
+      - server_cmaui_2
       - cmaui_port_11
       - cmaui_port_22
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2level
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
       network.outpoing.packets_cmaui_port_11:
       - cmaui_port_11
       - network.outpoing.packets
@@ -154,99 +154,102 @@ topology_template:
       binding_cmaui_port_22:
       - cmaui_port_22
       - binding
-      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.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      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
       network.incoming.packets.rate_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
       - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
       network.outgoing.bytes.rate_cmaui_port_22:
       - cmaui_port_22
       - network.outgoing.bytes.rate
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
       network.outpoing.packets_cmaui_port_22:
       - cmaui_port_22
       - network.outpoing.packets
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
       feature_cmaui_port_22:
       - cmaui_port_22
       - feature
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes
       network.incoming.bytes.rate_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.bytes.rate
-      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.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
       network.outgoing.bytes.rate_cmaui_port_11:
       - cmaui_port_11
       - network.outgoing.bytes.rate
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       feature_cmaui_port_11:
       - cmaui_port_11
       - feature
@@ -259,79 +262,70 @@ topology_template:
       network.outgoing.bytes_cmaui_port_11:
       - cmaui_port_11
       - network.outgoing.bytes
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
       network.incoming.packets_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.incoming.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.incoming.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.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       network.outgoing.packets.rate_cmaui_port_11:
       - cmaui_port_11
       - network.outgoing.packets.rate
       binding_cmaui_port_11:
       - cmaui_port_11
       - binding
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      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
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
       attachment_cmaui_port_11:
       - cmaui_port_11
       - attachment
       network.incoming.packets.rate_cmaui_port_11:
       - cmaui_port_11
       - network.incoming.packets.rate
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.outgoing.bytes_cmaui_port_22:
       - cmaui_port_22
       - network.outgoing.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
       network.incoming.packets_cmaui_port_11:
       - cmaui_port_11
       - network.incoming.packets
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
       network.incoming.bytes_cmaui_port_11:
       - cmaui_port_11
       - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
       link_cmaui_port_11:
       - cmaui_port_11
       - link
@@ -343,4 +337,10 @@ topology_template:
       - dependency
       dependency_cmaui_port_22:
       - cmaui_port_22
+      - dependency
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
+      dependency_server_cmaui_2:
+      - server_cmaui_2
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
index bd00c83..e3f39a1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -80,20 +80,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    test_nested2:
-      type: org.openecomp.resource.abstract.nodes.heat.nested2level
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: nested2levelServiceTemplate.yaml
-        p2:
-          get_input: p2
-        shared_security_group_id1:
-          get_input: shared_security_group_id1
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -110,6 +99,17 @@ topology_template:
           get_input:
           - cmaui_names
           - 0
+    test_nested2:
+      type: org.openecomp.resource.abstract.nodes.heat.nested2level
+      directives:
+      - substitutable
+      properties:
+        service_template_filter:
+          substitute_service_template: nested2levelServiceTemplate.yaml
+        p2:
+          get_input: p2
+        shared_security_group_id1:
+          get_input: shared_security_group_id1
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -136,7 +136,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_group:
@@ -146,8 +146,8 @@ topology_template:
         description: cmaui server template for vMMSC
       members:
       - cmaui_port_2
+      - server_cmaui_1
       - test_nested2
-      - server_cmaui
       - cmaui_port_1
   outputs:
     output_attr_1:
@@ -158,147 +158,171 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
       network.incoming.packets.rate_cmaui_port_22_test_nested2:
       - test_nested2
       - network.incoming.packets.rate_cmaui_port_22
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.write.requests.rate_server_cmaui_test_nested2:
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.usage_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested2:
+      - disk.device.usage_server_cmaui_2
+      host_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.capacity_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.latency_server_cmaui_test_nested2:
+      - host_server_cmaui_2
+      disk.root.size_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.latency_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested2:
+      - disk.root.size_server_cmaui_2
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.read.bytes.rate_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
       binding_cmaui_port_11_test_nested2:
       - test_nested2
       - binding_cmaui_port_11
-      endpoint_server_cmaui_test_nested2:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - endpoint_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested2:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.iops_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - disk.iops_server_cmaui_2
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
-      memory.usage_server_cmaui_test_nested2:
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.allocation_server_cmaui_2_test_nested2:
       - test_nested2
-      - memory.usage_server_cmaui
+      - disk.allocation_server_cmaui_2
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
       network.incoming.packets.rate_cmaui_port_11_test_nested2:
       - test_nested2
       - network.incoming.packets.rate_cmaui_port_11
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
       - disk.device.read.bytes
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
+      cpu_server_cmaui_2_test_nested2:
+      - test_nested2
+      - cpu_server_cmaui_2
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes.rate_server_cmaui_2
+      disk.device.read.bytes_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
+      endpoint_server_cmaui_2_test_nested2:
+      - test_nested2
+      - endpoint_server_cmaui_2
       binding_cmaui_port_22_test_nested2:
       - test_nested2
       - binding_cmaui_port_22
-      binding_server_cmaui_test_nested2:
+      cpu.delta_server_cmaui_2_test_nested2:
       - test_nested2
-      - binding_server_cmaui
+      - cpu.delta_server_cmaui_2
+      instance_server_cmaui_2_test_nested2:
+      - test_nested2
+      - instance_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.allocation_server_cmaui_test_nested2:
+      memory.usage_server_cmaui_2_test_nested2:
+      - test_nested2
+      - memory.usage_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.allocation_server_cmaui
+      - disk.write.requests.rate_server_cmaui_2
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      disk.read.requests_server_cmaui_test_nested2:
+      disk.device.write.bytes_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.read.requests_server_cmaui
+      - disk.device.write.bytes_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.capacity_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
       network.incoming.bytes.rate_cmaui_port_22_test_nested2:
       - test_nested2
       - network.incoming.bytes.rate_cmaui_port_22
-      disk.write.requests_server_cmaui_test_nested2:
+      disk.latency_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.latency_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.requests_server_cmaui
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_11_test_nested2:
       - test_nested2
       - network.outpoing.packets_cmaui_port_11
-      os_server_cmaui_test_nested2:
+      disk.device.read.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - os_server_cmaui
+      - disk.device.read.requests_server_cmaui_2
+      binding_server_cmaui_2_test_nested2:
+      - test_nested2
+      - binding_server_cmaui_2
+      os_server_cmaui_2_test_nested2:
+      - test_nested2
+      - os_server_cmaui_2
       feature_cmaui_port_22_test_nested2:
       - test_nested2
       - feature_cmaui_port_22
-      cpu_util_server_cmaui_test_nested2:
-      - test_nested2
-      - cpu_util_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      disk.write.bytes_server_cmaui_test_nested2:
+      disk.ephemeral.size_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.bytes_server_cmaui
-      vcpus_server_cmaui_test_nested2:
+      - disk.ephemeral.size_server_cmaui_2
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      vcpus_server_cmaui_2_test_nested2:
       - test_nested2
-      - vcpus_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      - vcpus_server_cmaui_2
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      cpu_server_cmaui_test_nested2:
-      - test_nested2
-      - cpu_server_cmaui
-      memory.resident_server_cmaui_test_nested2:
-      - test_nested2
-      - memory.resident_server_cmaui
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.outgoing.packets.rate_cmaui_port_22_test_nested2:
       - test_nested2
       - network.outgoing.packets.rate_cmaui_port_22
@@ -308,247 +332,217 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_11_test_nested2:
       - test_nested2
       - network.outgoing.bytes.rate_cmaui_port_11
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      host_server_cmaui_test_nested2:
-      - test_nested2
-      - host_server_cmaui
-      disk.usage_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.usage_server_cmaui
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
-      disk.ephemeral.size_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.ephemeral.size_server_cmaui
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
       network.incoming.packets_cmaui_port_11_test_nested2:
       - test_nested2
       - network.incoming.packets_cmaui_port_11
       network.incoming.bytes_cmaui_port_11_test_nested2:
       - test_nested2
       - network.incoming.bytes_cmaui_port_11
-      disk.device.read.requests.rate_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.read.requests.rate_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
       feature_cmaui_port_1:
       - cmaui_port_1
       - feature
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      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.write.bytes_server_cmaui_test_nested2:
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      cpu_util_server_cmaui_2_test_nested2:
+      - test_nested2
+      - cpu_util_server_cmaui_2
+      disk.device.iops_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.write.bytes_server_cmaui
+      - disk.device.iops_server_cmaui_2
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      scalable_server_cmaui_2_test_nested2:
+      - test_nested2
+      - scalable_server_cmaui_2
       network.incoming.bytes.rate_cmaui_port_11_test_nested2:
       - test_nested2
       - network.incoming.bytes.rate_cmaui_port_11
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      scalable_server_cmaui_test_nested2:
-      - test_nested2
-      - scalable_server_cmaui
       feature_test_nested2:
       - test_nested2
       - feature
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
       attachment_cmaui_port_22_test_nested2:
       - test_nested2
       - attachment_cmaui_port_22
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
       network.outgoing.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.packets.rate
-      disk.device.allocation_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.allocation_server_cmaui
-      disk.read.bytes_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.read.bytes_server_cmaui
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      memory_server_cmaui_test_nested2:
+      disk.write.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - memory_server_cmaui
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.read.requests_server_cmaui
-      disk.device.read.bytes.rate_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.device.latency_server_cmaui_test_nested2:
+      - disk.write.requests_server_cmaui_2
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      disk.read.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.latency_server_cmaui
-      network.outgoing.bytes_cmaui_port_11_test_nested2:
+      - disk.read.requests_server_cmaui_2
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
+      disk.device.capacity_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.outgoing.bytes_cmaui_port_11
-      disk.device.write.bytes.rate_server_cmaui_test_nested2:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.write.bytes.rate_server_cmaui
-      instance_server_cmaui_test_nested2:
+      - disk.device.read.requests.rate_server_cmaui_2
+      memory.resident_server_cmaui_2_test_nested2:
       - test_nested2
-      - instance_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      disk.write.bytes.rate_server_cmaui_test_nested2:
+      - memory.resident_server_cmaui_2
+      disk.usage_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.usage_server_cmaui_test_nested2:
+      - disk.usage_server_cmaui_2
+      network.outgoing.bytes_cmaui_port_11_test_nested2:
       - test_nested2
-      - disk.device.usage_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.iops_server_cmaui_test_nested2:
+      - network.outgoing.bytes_cmaui_port_11
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      feature_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.iops_server_cmaui
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested2:
+      - feature_server_cmaui_2
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - feature_server_cmaui
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      disk.device.iops_server_cmaui_test_nested2:
+      - disk.device.write.requests.rate_server_cmaui_2
+      memory_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.iops_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested2:
+      - memory_server_cmaui_2
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.device.write.requests_server_cmaui_2
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       network.outgoing.packets.rate_cmaui_port_11_test_nested2:
       - test_nested2
       - network.outgoing.packets.rate_cmaui_port_11
-      disk.device.write.requests_server_cmaui_test_nested2:
+      disk.read.bytes_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.write.requests_server_cmaui
+      - disk.read.bytes_server_cmaui_2
       network.outgoing.bytes_cmaui_port_22_test_nested2:
       - test_nested2
       - network.outgoing.bytes_cmaui_port_22
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.latency_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.latency_server_cmaui_2
+      disk.device.allocation_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.allocation_server_cmaui_2
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
       - test_nested2
       - network.outgoing.bytes.rate_cmaui_port_22
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
       network.incoming.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes.rate
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.root.size_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.root.size_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      disk.write.bytes_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.write.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_22_test_nested2:
       - test_nested2
       - network.incoming.packets_cmaui_port_22
       network.incoming.bytes_cmaui_port_22_test_nested2:
       - test_nested2
       - network.incoming.bytes_cmaui_port_22
-      cpu.delta_server_cmaui_test_nested2:
-      - test_nested2
-      - cpu.delta_server_cmaui
       network.outpoing.packets_cmaui_port_22_test_nested2:
       - test_nested2
       - network.outpoing.packets_cmaui_port_22
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
       feature_cmaui_port_11_test_nested2:
       - test_nested2
       - feature_cmaui_port_11
       attachment_cmaui_port_11_test_nested2:
       - test_nested2
       - attachment_cmaui_port_11
-      disk.device.capacity_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.capacity_server_cmaui
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
       dependency_cmaui_port_22_test_nested2:
       - test_nested2
       - dependency_cmaui_port_22
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      dependency_server_cmaui_test_nested2:
-      - test_nested2
-      - dependency_server_cmaui
       link_cmaui_port_22_test_nested2:
       - test_nested2
       - link_cmaui_port_22
@@ -561,12 +555,15 @@ topology_template:
       link_cmaui_port_1:
       - cmaui_port_1
       - link
-      local_storage_server_cmaui_test_nested2:
-      - test_nested2
-      - local_storage_server_cmaui
-      local_storage_server_cmaui:
-      - server_cmaui
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
       - local_storage
+      dependency_server_cmaui_2_test_nested2:
+      - test_nested2
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_2_test_nested2:
+      - test_nested2
+      - local_storage_server_cmaui_2
       dependency_test_nested2:
       - test_nested2
       - dependency
@@ -576,6 +573,9 @@ topology_template:
       link_cmaui_port_11_test_nested2:
       - test_nested2
       - link_cmaui_port_11
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_2:
       - cmaui_port_2
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml
index ce299b2..5ce72bb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml
index 6a123d1..31a0df7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index c139b7e..c81dd65 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -64,39 +64,41 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_test_nested2:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_11_test_nested2:
+    - local_storage_server_cmaui_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_22_test_nested2:
+    - dependency_server_cmaui_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_2_test_nested2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     - dependency_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -104,74 +106,72 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_11_test_nested3_test_nested2:
+    - dependency_server_cmaui_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11_test_nested3_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_3_test_nested3_test_nested2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_22_test_nested3_test_nested2:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_311_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22_test_nested3_test_nested2:
+    - link_cmaui_port_311_test_nested3_test_nested2:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3_test_nested2:
+    - dependency_cmaui_port_322_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3_test_nested2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_322_test_nested3_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2:
+        - 1
+        - 1
+    - dependency_cmaui_port_211_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_211_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
+        - 1
+        - 1
+    - dependency_cmaui_port_222_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_222_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -186,31 +186,25 @@ node_types:
         - 1
         - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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:
+      network.outpoing.packets_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_22_test_nested2:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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_nested3_test_nested2:
+      memory.usage_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -221,458 +215,467 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested2:
+      disk.device.usage_server_cmaui_2_test_nested2:
         type: org.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
+      host_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.root.size_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
-        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_nested3_test_nested2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_311_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3_test_nested2:
+      memory_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
+      network.outgoing.bytes_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2:
+        type: org.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_322_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_11_test_nested2:
+      binding_cmaui_port_322_test_nested3_test_nested2:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_11_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_22_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_311_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      disk.iops_server_cmaui_2_test_nested2:
         type: org.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_nested2:
+      network.outgoing.packets.rate_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_11_test_nested3_test_nested2:
+      network.outgoing.bytes_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3_test_nested2:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11_test_nested2:
+      network.outgoing.packets.rate_cmaui_port_311_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      network.outgoing.packets.rate_cmaui_port_222_test_nested2:
         type: org.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:
+      network.outgoing.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      cpu.delta_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.incoming.packets_cmaui_port_311_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested3_test_nested2:
+      disk.device.allocation_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_22_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3_test_nested2:
+      disk.latency_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested2:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3_test_nested2:
+      disk.allocation_server_cmaui_2_test_nested2:
         type: org.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_nested3_test_nested2:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3_test_nested2:
+      cpu_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.device.read.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_11_test_nested3_test_nested2:
+      network.outgoing.packets.rate_cmaui_port_211_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22_test_nested2:
-        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_nested2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22_test_nested3_test_nested2:
+      cpu.delta_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      instance_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_11_test_nested2:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested2:
-        type: tosca.capabilities.OperatingSystem
+      network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_22_test_nested2:
+      feature_cmaui_port_211_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested2:
+      network.incoming.packets_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      memory.usage_server_cmaui_2_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3_test_nested2:
+      disk.write.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      disk.capacity_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_22_test_nested3_test_nested2:
+      network.incoming.packets_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_22_test_nested3_test_nested2:
+      disk.device.write.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.write.requests_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22_test_nested3_test_nested2:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested2:
+      disk.capacity_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
+      disk.latency_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      network.incoming.bytes.rate_cmaui_port_211_test_nested2:
         type: org.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_nested2:
+      disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested2:
+      disk.device.read.requests_server_cmaui_2_test_nested2:
         type: org.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_nested3_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_211_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22_test_nested2:
+      os_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_211_test_nested2:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_cmaui_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      binding_cmaui_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3_test_nested2:
+      vcpus_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      binding_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      cpu_util_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -684,93 +687,90 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2:
+      cpu_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
+      network.incoming.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      network.incoming.packets_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_222_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
+      network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_22_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_11_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3_test_nested2:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3_test_nested2:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_11_test_nested2:
+      disk.read.bytes_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_11_test_nested2:
+      memory.resident_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
+      disk.device.latency_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      attachment_cmaui_port_222_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2:
+      network.incoming.bytes_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -788,12 +788,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      feature_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_222_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_cmaui_port_311_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_cmaui_port_1:
         type: tosca.capabilities.Node
         occurrences:
@@ -804,111 +814,102 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22_test_nested3_test_nested2:
-        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_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11_test_nested3_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_322_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested2:
+      disk.device.capacity_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11_test_nested2:
+      cpu_util_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_cmaui_test_nested2:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets_cmaui_port_211_test_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_2_test_nested2:
+        type: org.openecomp.capabilities.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_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_22_test_nested2:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.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:
+      network.outgoing.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -919,319 +920,333 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested2:
+      disk.device.usage_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.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_2_test_nested2:
         type: org.openecomp.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.root.size_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_11_test_nested3_test_nested2:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22_test_nested3_test_nested2:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_222_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2:
+      disk.device.capacity_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_11_test_nested2:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
+      memory.resident_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      disk.usage_server_cmaui_2_test_nested2:
         type: org.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_nested2:
+      disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_11_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2:
+      network.outgoing.bytes.rate_cmaui_port_211_test_nested2:
         type: org.openecomp.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_nested2:
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      feature_server_cmaui_2_test_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory_server_cmaui_2_test_nested2:
         type: org.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.allocation_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2:
+      network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.iops_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11_test_nested3_test_nested2:
+      disk.device.write.requests_server_cmaui_2_test_nested2:
         type: org.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_nested2:
-        type: tosca.capabilities.Node
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3_test_nested2:
+      network.incoming.packets.rate_cmaui_port_211_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      disk.read.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.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.allocation_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      vcpus_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested2:
+      network.outgoing.bytes_cmaui_port_211_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11_test_nested2:
+      disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      disk.read.requests_server_cmaui_3_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.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_nested3_test_nested2:
+      instance_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_22_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
+        type: org.openecomp.capabilities.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_nested2:
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22_test_nested2:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3_test_nested2:
+      disk.device.latency_server_cmaui_2_test_nested2:
         type: org.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_nested3_test_nested2:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.usage_server_cmaui_3_test_nested3_test_nested2:
+        type: org.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.rate_cmaui_port_322_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      network.outpoing.packets_cmaui_port_211_test_nested2:
         type: org.openecomp.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_nested3_test_nested2:
         type: org.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.allocation_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_211_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_222_test_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      scalable_server_cmaui_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2:
+      network.incoming.bytes.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3_test_nested2:
+      network.incoming.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2:
+      network.incoming.packets_cmaui_port_322_test_nested3_test_nested2:
         type: org.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_nested3_test_nested2:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_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:
@@ -1249,64 +1264,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22_test_nested2:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_22_test_nested2:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested2:
+      disk.write.bytes_server_cmaui_2_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_11_test_nested3_test_nested2:
+      cpu_util_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_22_test_nested2:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
         type: org.openecomp.capabilities.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_nested3_test_nested2:
+      memory.resident_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_11_test_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_11_test_nested2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2:
+      disk.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2:
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1358,414 +1358,414 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_11:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_3:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_22:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_311:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22:
+    - link_cmaui_port_311:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_322:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_322:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      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.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
+      feature_server_cmaui_3:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    capabilities:
-      cpu.delta_server_cmaui:
+      disk.device.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_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
-      network.outpoing.packets_cmaui_port_11:
+      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
-      network.outgoing.packets.rate_cmaui_port_22:
+      network.outgoing.bytes_cmaui_port_311:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_22:
+      binding_server_cmaui_3:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - 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
-      cpu_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.write.bytes.rate_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
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_311:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_22:
+      disk.read.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_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.device.write.requests_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:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.incoming.bytes_cmaui_port_311:
         type: org.openecomp.capabilities.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.
+      attachment_cmaui_port_311:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      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
-      disk.device.usage_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
-      network.outgoing.bytes.rate_cmaui_port_22:
+      network.outpoing.packets_cmaui_port_311:
         type: org.openecomp.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:
+      network.incoming.packets_cmaui_port_322:
         type: org.openecomp.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.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
-      network.outpoing.packets_cmaui_port_22:
-        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:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.read.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.outgoing.bytes_cmaui_port_322:
         type: org.openecomp.capabilities.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_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      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
-      feature_cmaui_port_22:
+      feature_cmaui_port_311:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_322:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22:
+      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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      memory_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_11:
+      network.incoming.bytes_cmaui_port_322:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_11:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_22:
+      attachment_cmaui_port_322:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11:
+      network.incoming.packets_cmaui_port_311:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_11:
+      network.outpoing.packets_cmaui_port_322:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22:
+      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
-      memory.resident_server_cmaui:
+      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_cmaui_port_22:
+      network.outgoing.packets.rate_cmaui_port_311:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_cmaui_port_311:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_311:
         type: org.openecomp.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:
+      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
-      feature_server_cmaui:
+      feature_cmaui_port_322:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_311:
         type: org.openecomp.capabilities.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.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.allocation_server_cmaui:
+      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.write.requests_server_cmaui:
+      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
-      network.outgoing.packets.rate_cmaui_port_11:
+      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
-      binding_cmaui_port_11:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_322:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_11:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_322:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11:
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22:
+      network.outgoing.bytes.rate_cmaui_port_322:
         type: org.openecomp.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.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
-      network.incoming.packets_cmaui_port_11:
+      network.incoming.packets.rate_cmaui_port_322:
         type: org.openecomp.capabilities.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_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_11:
+      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.read.bytes_server_cmaui:
+      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:
@@ -1817,838 +1817,838 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_11:
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_22:
+        - 0
+        - UNBOUNDED
+    - dependency_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3:
+    - dependency_server_cmaui_3_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_11_test_nested3:
+    - local_storage_server_cmaui_3_test_nested3:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_311_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_11_test_nested3:
+    - link_cmaui_port_311_test_nested3:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_22_test_nested3:
+    - dependency_cmaui_port_322_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_22_test_nested3:
+    - link_cmaui_port_322_test_nested3:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3:
+    - dependency_cmaui_port_211:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_211:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
+        - 1
+        - 1
+    - dependency_cmaui_port_222:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_222:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.device.write.bytes_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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_nested3:
         type: org.openecomp.capabilities.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:
+      network.incoming.bytes_cmaui_port_222:
         type: org.openecomp.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_nested3:
+      network.incoming.packets_cmaui_port_211:
         type: org.openecomp.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_nested3:
+      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:
+      cpu_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_22_test_nested3:
+      disk.latency_server_cmaui_3_test_nested3:
         type: org.openecomp.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_nested3:
+      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.read.bytes.rate_server_cmaui_test_nested3:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3:
         type: org.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
-      network.incoming.packets.rate_cmaui_port_22:
+      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
-      binding_cmaui_port_11_test_nested3:
+      binding_server_cmaui_3_test_nested3:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3:
-        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3:
+      disk.write.requests.rate_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets.rate_cmaui_port_311_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11_test_nested3:
+      disk.device.latency_server_cmaui_3_test_nested3:
         type: org.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_nested3:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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:
+      memory_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_22:
+      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
-      binding_cmaui_port_22_test_nested3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.packets.rate_cmaui_port_311_test_nested3:
+        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
-      binding_server_cmaui_test_nested3:
-        type: tosca.capabilities.network.Bindable
+      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
-      network.incoming.bytes.rate_cmaui_port_22_test_nested3:
+      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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.read.requests_server_cmaui_3_test_nested3:
+        type: org.openecomp.capabilities.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.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.allocation_server_cmaui_test_nested3:
+      disk.usage_server_cmaui_3_test_nested3:
         type: org.openecomp.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_nested3:
+      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
-      feature_cmaui_port_11:
+      feature_server_cmaui_3_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11:
+      endpoint_server_cmaui_3_test_nested3:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_322_test_nested3:
         type: org.openecomp.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_nested3:
+      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
-      network.outgoing.bytes_cmaui_port_11:
+      disk.device.read.bytes_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_11_test_nested3:
+      instance_server_cmaui_3_test_nested3:
         type: org.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_nested3:
-        type: tosca.capabilities.OperatingSystem
+      cpu.delta_server_cmaui_3_test_nested3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_22_test_nested3:
-        type: tosca.capabilities.Node
+      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
-      cpu_util_server_cmaui_test_nested3:
+      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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3_test_nested3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3:
+      network.incoming.packets_cmaui_port_311_test_nested3:
         type: org.openecomp.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_nested3:
+      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
-      memory.usage_server_cmaui:
+      disk.device.usage_server_cmaui_3_test_nested3:
         type: org.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_nested3:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.iops_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22_test_nested3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3:
         type: org.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_nested3:
+      network.outgoing.bytes_cmaui_port_211:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_11:
+      network.incoming.bytes_cmaui_port_311_test_nested3:
         type: org.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_nested3:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_server_cmaui_3_test_nested3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3_test_nested3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_11_test_nested3:
+      binding_cmaui_port_322_test_nested3:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_211:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_11_test_nested3:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3:
         type: org.openecomp.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.bytes.rate_cmaui_port_322_test_nested3:
         type: org.openecomp.capabilities.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_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested3:
+      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
-      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.
+      attachment_cmaui_port_211:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3:
+      network.outpoing.packets_cmaui_port_211:
         type: org.openecomp.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_nested3:
+      network.incoming.bytes_cmaui_port_211:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_11:
+      network.incoming.packets_cmaui_port_222:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_22:
+      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
-      binding_cmaui_port_22:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      attachment_cmaui_port_11_test_nested3:
-        type: tosca.capabilities.Attachment
+      network.outpoing.packets_cmaui_port_311_test_nested3:
+        type: org.openecomp.capabilities.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_nested3:
+      network.outgoing.bytes_cmaui_port_222:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.outgoing.bytes_cmaui_port_311_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_322_test_nested3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_222:
         type: org.openecomp.capabilities.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_nested3:
+      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
-      feature_test_nested3:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_11_test_nested3:
+      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_test_nested3:
+      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
-      scalable_server_cmaui_test_nested3:
-        type: tosca.capabilities.Scalable
+      attachment_cmaui_port_222:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_222:
         type: org.openecomp.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.read.bytes_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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.write.requests_server_cmaui_3_test_nested3:
         type: org.openecomp.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_311_test_nested3:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3:
+      disk.capacity_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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:
+      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
-      network.outgoing.bytes.rate_cmaui_port_22:
-        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
-      attachment_cmaui_port_22_test_nested3:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_311_test_nested3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3:
+      network.outgoing.packets.rate_cmaui_port_211:
         type: org.openecomp.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:
+      binding_cmaui_port_211:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_211:
         type: org.openecomp.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.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_server_cmaui_test_nested3:
+      disk.device.read.requests_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_22:
-        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
-      network.outgoing.bytes_cmaui_port_11_test_nested3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_222:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3:
+      network.incoming.bytes.rate_cmaui_port_211:
         type: org.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_nested3:
-        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.write.bytes.rate_server_cmaui_test_nested3:
-        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_nested3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_22:
-        type: tosca.capabilities.Node
+      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.write.bytes.rate_server_cmaui_test_nested3:
+      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.device.usage_server_cmaui_test_nested3:
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3:
         type: org.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
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3:
+      memory.resident_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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.allocation_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_11:
+      network.outgoing.packets.rate_cmaui_port_222:
         type: org.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_nested3:
+      binding_cmaui_port_222:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_322_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3:
+      network.outgoing.bytes.rate_cmaui_port_222:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11_test_nested3:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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_nested3:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22_test_nested3:
+      network.incoming.packets.rate_cmaui_port_222:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_22_test_nested3:
+      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
-      attachment_cmaui_port_22:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes_cmaui_port_322_test_nested3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_22_test_nested3:
-        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:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_22:
+      network.outgoing.packets.rate_cmaui_port_322_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_22:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_311_test_nested3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3:
+      cpu_util_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested3:
+      network.outpoing.packets_cmaui_port_322_test_nested3:
         type: org.openecomp.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_nested3:
+      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.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3:
         type: org.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:
+      vcpus_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.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.ephemeral.size_server_cmaui_3_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.read.requests_server_cmaui_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_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_11:
+      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
-      binding_cmaui_port_11:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3:
+      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.outpoing.packets_cmaui_port_22_test_nested3:
+      network.incoming.packets_cmaui_port_322_test_nested3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_11:
-        type: tosca.capabilities.Attachment
+      network.incoming.packets.rate_cmaui_port_322_test_nested3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.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
-      feature_cmaui_port_11_test_nested3:
+      feature_cmaui_port_211:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_11:
+      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
-      network.incoming.bytes_cmaui_port_11:
+      network.incoming.bytes_cmaui_port_322_test_nested3:
         type: org.openecomp.capabilities.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_nested3:
+      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:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
index 9d3f823..ed19586 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -103,27 +103,27 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_cmaui_port_2
+          capability: attachment_cmaui_port_211_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_22_test_nested2
+          capability: attachment_cmaui_port_222_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_1
+          capability: attachment_cmaui_port_311_test_nested3_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_11_test_nested3_test_nested2
+          capability: attachment_cmaui_port_322_test_nested3_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_22_test_nested3_test_nested2
+          capability: attachment_cmaui_port_2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_11_test_nested2
+          capability: attachment_cmaui_port_1
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
     jsa_security_group2:
@@ -199,15 +199,15 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_cmaui_port_1
+          capability: attachment_cmaui_port_211_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_11_test_nested3_test_nested2
+          capability: attachment_cmaui_port_311_test_nested3_test_nested2
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cmaui_port_11_test_nested2
+          capability: attachment_cmaui_port_1
           node: test_nested
           relationship: org.openecomp.relationships.AttachesTo
     test_nested:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
index 334da11..12b7583 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml
@@ -55,7 +55,31 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    cmaui_port_11:
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
+    test_nested3:
+      type: org.openecomp.resource.abstract.nodes.heat.nested3level
+      directives:
+      - substitutable
+      properties:
+        service_template_filter:
+          substitute_service_template: nested3levelServiceTemplate.yaml
+        p2:
+          get_input: p2
+        shared_security_group_id1:
+          get_input: shared_security_group_id1
+    cmaui_port_211:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -81,9 +105,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_22:
+    cmaui_port_222:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -108,32 +132,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
-    test_nested3:
-      type: org.openecomp.resource.abstract.nodes.heat.nested3level
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: nested3levelServiceTemplate.yaml
-        p2:
-          get_input: p2
-        shared_security_group_id1:
-          get_input: shared_security_group_id1
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2level_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -141,431 +141,431 @@ topology_template:
         heat_file: ../Artifacts/nested2level.yml
         description: cmaui server template for vMMSC
       members:
-      - cmaui_port_11
-      - cmaui_port_22
+      - server_cmaui_2
       - test_nested3
-      - server_cmaui
+      - cmaui_port_211
+      - cmaui_port_222
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2level
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.write.requests.rate_server_cmaui_test_nested3:
+      disk.device.write.bytes_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3:
+      - disk.device.write.bytes_server_cmaui_3
+      memory.usage_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.capacity_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      network.incoming.packets.rate_cmaui_port_22_test_nested3:
+      - memory.usage_server_cmaui_3
+      network.incoming.bytes_cmaui_port_222:
+      - cmaui_port_222
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_211:
+      - cmaui_port_211
+      - network.incoming.packets
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      cpu_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.incoming.packets.rate_cmaui_port_22
-      disk.latency_server_cmaui_test_nested3:
+      - cpu_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.latency_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested3:
+      - disk.latency_server_cmaui_3
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.read.bytes.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.read.bytes.rate_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      network.incoming.packets.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.packets.rate
-      binding_cmaui_port_11_test_nested3:
+      - disk.read.bytes.rate_server_cmaui_3
+      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
+      binding_server_cmaui_3_test_nested3:
       - test_nested3
-      - binding_cmaui_port_11
-      endpoint_server_cmaui_test_nested3:
+      - binding_server_cmaui_3
+      disk.write.requests.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - endpoint_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3:
+      - disk.write.requests.rate_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_311_test_nested3:
       - test_nested3
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.incoming.packets.rate_cmaui_port_11_test_nested3:
+      - network.incoming.packets.rate_cmaui_port_311
+      disk.device.latency_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.incoming.packets.rate_cmaui_port_11
-      memory.usage_server_cmaui_test_nested3:
+      - disk.device.latency_server_cmaui_3
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      disk.device.allocation_server_cmaui_3_test_nested3:
       - test_nested3
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      network.incoming.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.bytes.rate
-      binding_cmaui_port_22_test_nested3:
+      - disk.device.allocation_server_cmaui_3
+      memory_server_cmaui_3_test_nested3:
       - test_nested3
-      - binding_cmaui_port_22
-      binding_server_cmaui_test_nested3:
+      - memory_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - binding_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_22_test_nested3:
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      network.outgoing.packets.rate_cmaui_port_311_test_nested3:
       - test_nested3
-      - network.incoming.bytes.rate_cmaui_port_22
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.allocation_server_cmaui_test_nested3:
+      - network.outgoing.packets.rate_cmaui_port_311
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      disk.read.requests_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.allocation_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3:
+      - disk.read.requests_server_cmaui_3
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      disk.usage_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.read.requests_server_cmaui
-      feature_cmaui_port_11:
-      - cmaui_port_11
-      - feature
-      network.incoming.bytes.rate_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui_test_nested3:
+      - disk.usage_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes
+      feature_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.write.requests_server_cmaui
-      network.outgoing.bytes_cmaui_port_11:
-      - cmaui_port_11
-      - network.outgoing.bytes
-      network.outpoing.packets_cmaui_port_11_test_nested3:
+      - feature_server_cmaui_3
+      endpoint_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.outpoing.packets_cmaui_port_11
-      os_server_cmaui_test_nested3:
+      - endpoint_server_cmaui_3
+      network.outgoing.bytes.rate_cmaui_port_322_test_nested3:
       - test_nested3
-      - os_server_cmaui
-      feature_cmaui_port_22_test_nested3:
+      - network.outgoing.bytes.rate_cmaui_port_322
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_3_test_nested3:
       - test_nested3
-      - feature_cmaui_port_22
-      cpu_util_server_cmaui_test_nested3:
+      - disk.device.read.bytes_server_cmaui_3
+      instance_server_cmaui_3_test_nested3:
       - test_nested3
-      - cpu_util_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      disk.usage_server_cmaui_test_nested3:
+      - instance_server_cmaui_3
+      cpu.delta_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3:
+      - cpu.delta_server_cmaui_3
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      host_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.write.bytes_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      vcpus_server_cmaui_test_nested3:
+      - host_server_cmaui_3
+      network.incoming.packets_cmaui_port_311_test_nested3:
       - test_nested3
-      - vcpus_server_cmaui
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      - network.incoming.packets_cmaui_port_311
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
       - disk.ephemeral.size
-      network.outgoing.packets.rate_cmaui_port_22_test_nested3:
+      disk.device.usage_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.outgoing.packets.rate_cmaui_port_22
-      memory.resident_server_cmaui_test_nested3:
+      - disk.device.usage_server_cmaui_3
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      disk.device.iops_server_cmaui_3_test_nested3:
       - test_nested3
-      - memory.resident_server_cmaui
-      network.incoming.packets.rate_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.packets.rate
-      host_server_cmaui_test_nested3:
+      - disk.device.iops_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - host_server_cmaui
-      network.outgoing.bytes_cmaui_port_22:
-      - cmaui_port_22
+      - disk.device.write.bytes.rate_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_211:
+      - cmaui_port_211
       - network.outgoing.bytes
-      network.incoming.packets_cmaui_port_11_test_nested3:
+      network.incoming.bytes_cmaui_port_311_test_nested3:
       - test_nested3
-      - network.incoming.packets_cmaui_port_11
-      network.incoming.bytes_cmaui_port_11_test_nested3:
+      - network.incoming.bytes_cmaui_port_311
+      disk.device.capacity_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.incoming.bytes_cmaui_port_11
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested3:
+      - disk.device.capacity_server_cmaui_3
+      scalable_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.outgoing.bytes.rate_cmaui_port_11
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      cpu_server_cmaui_test_nested3:
+      - scalable_server_cmaui_3
+      binding_cmaui_port_322_test_nested3:
       - test_nested3
-      - cpu_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested3:
+      - binding_cmaui_port_322
+      network.incoming.packets.rate_cmaui_port_211:
+      - cmaui_port_211
+      - network.incoming.packets.rate
+      disk.write.bytes.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.ephemeral.size_server_cmaui
-      network.outpoing.packets_cmaui_port_11:
-      - cmaui_port_11
-      - network.outpoing.packets
-      network.outgoing.packets.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.packets.rate
-      binding_cmaui_port_22:
-      - cmaui_port_22
-      - binding
-      attachment_cmaui_port_11_test_nested3:
+      - disk.write.bytes.rate_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_322_test_nested3:
       - test_nested3
-      - attachment_cmaui_port_11
-      disk.device.read.requests.rate_server_cmaui_test_nested3:
+      - network.incoming.bytes.rate_cmaui_port_322
+      disk.write.bytes_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.read.requests.rate_server_cmaui
-      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
-      disk.device.write.bytes_server_cmaui_test_nested3:
+      - disk.write.bytes_server_cmaui_3
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      attachment_cmaui_port_211:
+      - cmaui_port_211
+      - attachment
+      network.outpoing.packets_cmaui_port_211:
+      - cmaui_port_211
+      - network.outpoing.packets
+      network.incoming.bytes_cmaui_port_211:
+      - cmaui_port_211
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_222:
+      - cmaui_port_222
+      - network.incoming.packets
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
+      network.outpoing.packets_cmaui_port_311_test_nested3:
       - test_nested3
-      - disk.device.write.bytes_server_cmaui
-      feature_test_nested3:
+      - network.outpoing.packets_cmaui_port_311
+      network.outgoing.bytes_cmaui_port_222:
+      - cmaui_port_222
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_311_test_nested3:
       - test_nested3
-      - feature
-      network.incoming.bytes.rate_cmaui_port_11_test_nested3:
+      - network.outgoing.bytes_cmaui_port_311
+      attachment_cmaui_port_322_test_nested3:
       - test_nested3
-      - network.incoming.bytes.rate_cmaui_port_11
-      disk.read.bytes_server_cmaui_test_nested3:
+      - attachment_cmaui_port_322
+      network.incoming.bytes.rate_cmaui_port_222:
+      - cmaui_port_222
+      - network.incoming.bytes.rate
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      attachment_cmaui_port_222:
+      - cmaui_port_222
+      - attachment
+      network.outpoing.packets_cmaui_port_222:
+      - cmaui_port_222
+      - network.outpoing.packets
+      disk.read.bytes_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.read.bytes_server_cmaui
-      scalable_server_cmaui_test_nested3:
+      - disk.read.bytes_server_cmaui_3
+      disk.device.write.requests_server_cmaui_3_test_nested3:
       - test_nested3
-      - scalable_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.allocation_server_cmaui_test_nested3:
+      - disk.device.write.requests_server_cmaui_3
+      binding_cmaui_port_311_test_nested3:
       - test_nested3
-      - disk.device.allocation_server_cmaui
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      network.outgoing.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.bytes.rate
-      attachment_cmaui_port_22_test_nested3:
+      - binding_cmaui_port_311
+      disk.capacity_server_cmaui_3_test_nested3:
       - test_nested3
-      - attachment_cmaui_port_22
-      memory_server_cmaui_test_nested3:
+      - disk.capacity_server_cmaui_3
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
+      feature_cmaui_port_311_test_nested3:
       - test_nested3
-      - memory_server_cmaui
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui_test_nested3:
+      - feature_cmaui_port_311
+      network.outgoing.packets.rate_cmaui_port_211:
+      - cmaui_port_211
+      - network.outgoing.packets.rate
+      binding_cmaui_port_211:
+      - cmaui_port_211
+      - binding
+      network.outgoing.bytes.rate_cmaui_port_211:
+      - cmaui_port_211
+      - network.outgoing.bytes.rate
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.read.requests_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.read.requests_server_cmaui
-      network.outpoing.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.outpoing.packets
-      network.outgoing.bytes_cmaui_port_11_test_nested3:
+      - disk.device.read.requests_server_cmaui_3
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      feature_test_nested3:
       - test_nested3
-      - network.outgoing.bytes_cmaui_port_11
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.device.read.bytes.rate_server_cmaui_test_nested3:
+      - feature
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
+      feature_cmaui_port_222:
+      - cmaui_port_222
+      - feature
+      network.incoming.bytes.rate_cmaui_port_211:
+      - cmaui_port_211
+      - network.incoming.bytes.rate
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      os_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3:
+      - os_server_cmaui_3
+      disk.write.requests_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.latency_server_cmaui
-      instance_server_cmaui_test_nested3:
+      - disk.write.requests_server_cmaui_3
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3:
       - test_nested3
-      - instance_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3:
+      - network.incoming.bytes.rate_cmaui_port_311
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      memory.resident_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.write.bytes.rate_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      feature_cmaui_port_22:
-      - cmaui_port_22
-      - feature
-      disk.write.bytes.rate_server_cmaui_test_nested3:
+      - memory.resident_server_cmaui_3
+      disk.allocation_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.usage_server_cmaui_test_nested3:
+      - disk.allocation_server_cmaui_3
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3:
       - test_nested3
-      - disk.device.usage_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
+      - network.outgoing.bytes.rate_cmaui_port_311
+      network.outgoing.packets.rate_cmaui_port_222:
+      - cmaui_port_222
+      - network.outgoing.packets.rate
+      binding_cmaui_port_222:
+      - cmaui_port_222
       - binding
-      disk.iops_server_cmaui_test_nested3:
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      feature_cmaui_port_322_test_nested3:
       - test_nested3
-      - disk.iops_server_cmaui
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      network.outgoing.bytes.rate_cmaui_port_11:
-      - cmaui_port_11
+      - feature_cmaui_port_322
+      network.outgoing.bytes.rate_cmaui_port_222:
+      - cmaui_port_222
       - network.outgoing.bytes.rate
-      feature_server_cmaui_test_nested3:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - feature_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3:
+      - disk.device.read.bytes.rate_server_cmaui_3
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.device.write.requests.rate_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_11_test_nested3:
+      - disk.device.write.requests.rate_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_222:
+      - cmaui_port_222
+      - network.incoming.packets.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      network.outgoing.bytes_cmaui_port_322_test_nested3:
       - test_nested3
-      - network.outgoing.packets.rate_cmaui_port_11
-      disk.device.write.requests_server_cmaui_test_nested3:
+      - network.outgoing.bytes_cmaui_port_322
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      network.outgoing.packets.rate_cmaui_port_322_test_nested3:
       - test_nested3
-      - disk.device.write.requests_server_cmaui
-      network.incoming.packets_cmaui_port_22_test_nested3:
+      - network.outgoing.packets.rate_cmaui_port_322
+      disk.iops_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.incoming.packets_cmaui_port_22
-      network.incoming.bytes_cmaui_port_22_test_nested3:
+      - disk.iops_server_cmaui_3
+      attachment_cmaui_port_311_test_nested3:
       - test_nested3
-      - network.incoming.bytes_cmaui_port_22
-      attachment_cmaui_port_22:
-      - cmaui_port_22
-      - attachment
-      network.outgoing.bytes_cmaui_port_22_test_nested3:
+      - attachment_cmaui_port_311
+      cpu_util_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.outgoing.bytes_cmaui_port_22
-      network.incoming.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      network.incoming.bytes_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.bytes
-      disk.device.iops_server_cmaui_test_nested3:
+      - cpu_util_server_cmaui_3
+      network.outpoing.packets_cmaui_port_322_test_nested3:
       - test_nested3
-      - disk.device.iops_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested3:
+      - network.outpoing.packets_cmaui_port_322
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.root.size_server_cmaui_3_test_nested3:
       - test_nested3
-      - network.outgoing.bytes.rate_cmaui_port_22
-      disk.root.size_server_cmaui_test_nested3:
+      - disk.root.size_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3:
       - test_nested3
-      - disk.root.size_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.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      network.outgoing.packets.rate_cmaui_port_11:
-      - cmaui_port_11
-      - network.outgoing.packets.rate
-      binding_cmaui_port_11:
-      - cmaui_port_11
-      - binding
-      cpu.delta_server_cmaui_test_nested3:
+      - vcpus_server_cmaui_3
+      disk.ephemeral.size_server_cmaui_3_test_nested3:
       - test_nested3
-      - cpu.delta_server_cmaui
-      network.outpoing.packets_cmaui_port_22_test_nested3:
+      - disk.ephemeral.size_server_cmaui_3
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
+      network.incoming.packets_cmaui_port_322_test_nested3:
       - test_nested3
-      - network.outpoing.packets_cmaui_port_22
-      attachment_cmaui_port_11:
-      - cmaui_port_11
-      - attachment
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      feature_cmaui_port_11_test_nested3:
+      - network.incoming.packets_cmaui_port_322
+      network.incoming.packets.rate_cmaui_port_322_test_nested3:
       - test_nested3
-      - feature_cmaui_port_11
-      network.incoming.packets_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.packets
-      network.incoming.bytes_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.bytes
-      disk.device.capacity_server_cmaui_test_nested3:
+      - network.incoming.packets.rate_cmaui_port_322
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      feature_cmaui_port_211:
+      - cmaui_port_211
+      - feature
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      network.incoming.bytes_cmaui_port_322_test_nested3:
       - test_nested3
-      - disk.device.capacity_server_cmaui
+      - network.incoming.bytes_cmaui_port_322
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      dependency_server_cmaui_test_nested3:
+      dependency_server_cmaui_3_test_nested3:
       - test_nested3
-      - dependency_server_cmaui
-      dependency_cmaui_port_11_test_nested3:
-      - test_nested3
-      - dependency_cmaui_port_11
-      link_cmaui_port_22_test_nested3:
-      - test_nested3
-      - link_cmaui_port_22
-      dependency_cmaui_port_22_test_nested3:
+      - dependency_server_cmaui_3
+      link_cmaui_port_211:
+      - cmaui_port_211
+      - link
+      link_cmaui_port_222:
+      - cmaui_port_222
+      - link
+      dependency_cmaui_port_311_test_nested3:
       - test_nested3
-      - dependency_cmaui_port_22
-      local_storage_server_cmaui_test_nested3:
+      - dependency_cmaui_port_311
+      link_cmaui_port_322_test_nested3:
       - test_nested3
-      - local_storage_server_cmaui
-      local_storage_server_cmaui:
-      - server_cmaui
+      - link_cmaui_port_322
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
       - local_storage
-      link_cmaui_port_11:
-      - cmaui_port_11
-      - link
-      link_cmaui_port_22:
-      - cmaui_port_22
-      - link
-      dependency_cmaui_port_11:
-      - cmaui_port_11
+      dependency_cmaui_port_211:
+      - cmaui_port_211
       - dependency
-      dependency_cmaui_port_22:
-      - cmaui_port_22
+      dependency_cmaui_port_222:
+      - cmaui_port_222
       - dependency
+      link_cmaui_port_311_test_nested3:
+      - test_nested3
+      - link_cmaui_port_311
       dependency_test_nested3:
       - test_nested3
       - dependency
-      link_cmaui_port_11_test_nested3:
+      local_storage_server_cmaui_3_test_nested3:
+      - test_nested3
+      - local_storage_server_cmaui_3
+      dependency_cmaui_port_322_test_nested3:
       - test_nested3
-      - link_cmaui_port_11
\ No newline at end of file
+      - dependency_cmaui_port_322
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
index 1e2f187..ae64c41 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml
@@ -55,7 +55,20 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    cmaui_port_11:
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
+    cmaui_port_311:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -81,9 +94,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_22:
+    cmaui_port_322:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -108,21 +121,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3level_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -130,217 +130,217 @@ topology_template:
         heat_file: ../Artifacts/nested3level.yml
         description: cmaui server template for vMMSC
       members:
-      - cmaui_port_11
-      - cmaui_port_22
-      - server_cmaui
+      - server_cmaui_3
+      - cmaui_port_311
+      - cmaui_port_322
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3level
     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
-      network.outpoing.packets_cmaui_port_11:
-      - cmaui_port_11
-      - network.outpoing.packets
-      network.outgoing.packets.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.packets.rate
-      binding_cmaui_port_22:
-      - cmaui_port_22
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
+      network.outgoing.bytes_cmaui_port_311:
+      - cmaui_port_311
+      - network.outgoing.bytes
+      binding_server_cmaui_3:
+      - server_cmaui_3
       - binding
-      scalable_server_cmaui:
-      - server_cmaui
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
+      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
+      scalable_server_cmaui_3:
+      - server_cmaui_3
       - 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
-      network.incoming.packets.rate_cmaui_port_22:
-      - cmaui_port_22
+      network.incoming.packets.rate_cmaui_port_311:
+      - cmaui_port_311
       - network.incoming.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
       - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      network.outgoing.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.bytes.rate
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      network.outpoing.packets_cmaui_port_22:
-      - cmaui_port_22
+      network.incoming.bytes_cmaui_port_311:
+      - cmaui_port_311
+      - network.incoming.bytes
+      attachment_cmaui_port_311:
+      - cmaui_port_311
+      - attachment
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      network.outpoing.packets_cmaui_port_311:
+      - cmaui_port_311
       - network.outpoing.packets
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      feature_cmaui_port_22:
-      - cmaui_port_22
+      network.incoming.packets_cmaui_port_322:
+      - cmaui_port_322
+      - network.incoming.packets
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
+      network.outgoing.bytes_cmaui_port_322:
+      - cmaui_port_322
+      - network.outgoing.bytes
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests.rate
+      feature_cmaui_port_311:
+      - cmaui_port_311
       - feature
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      network.incoming.bytes.rate_cmaui_port_22:
-      - cmaui_port_22
+      network.incoming.bytes.rate_cmaui_port_322:
+      - cmaui_port_322
       - network.incoming.bytes.rate
-      binding_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      disk.device.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.allocation
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      network.incoming.bytes_cmaui_port_322:
+      - cmaui_port_322
+      - network.incoming.bytes
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      attachment_cmaui_port_322:
+      - cmaui_port_322
+      - attachment
+      network.incoming.packets_cmaui_port_311:
+      - cmaui_port_311
+      - network.incoming.packets
+      network.outpoing.packets_cmaui_port_322:
+      - cmaui_port_322
+      - network.outpoing.packets
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      network.outgoing.packets.rate_cmaui_port_311:
+      - cmaui_port_311
+      - network.outgoing.packets.rate
+      binding_cmaui_port_311:
+      - cmaui_port_311
       - 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
-      network.outgoing.bytes.rate_cmaui_port_11:
-      - cmaui_port_11
+      network.outgoing.bytes.rate_cmaui_port_311:
+      - cmaui_port_311
       - network.outgoing.bytes.rate
-      feature_cmaui_port_11:
-      - cmaui_port_11
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
+      feature_cmaui_port_322:
+      - cmaui_port_322
       - feature
-      attachment_cmaui_port_22:
-      - cmaui_port_22
-      - attachment
-      network.incoming.bytes.rate_cmaui_port_11:
-      - cmaui_port_11
+      network.incoming.bytes.rate_cmaui_port_311:
+      - cmaui_port_311
       - network.incoming.bytes.rate
-      network.outgoing.bytes_cmaui_port_11:
-      - cmaui_port_11
-      - network.outgoing.bytes
-      network.incoming.packets_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      network.incoming.bytes_cmaui_port_22:
-      - cmaui_port_22
-      - network.incoming.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.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      network.outgoing.packets.rate_cmaui_port_11:
-      - cmaui_port_11
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
+      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
+      network.outgoing.packets.rate_cmaui_port_322:
+      - cmaui_port_322
       - network.outgoing.packets.rate
-      binding_cmaui_port_11:
-      - cmaui_port_11
+      binding_cmaui_port_322:
+      - cmaui_port_322
       - binding
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      attachment_cmaui_port_11:
-      - cmaui_port_11
-      - attachment
-      network.incoming.packets.rate_cmaui_port_11:
-      - cmaui_port_11
+      cpu.delta_server_cmaui_3:
+      - server_cmaui_3
+      - cpu.delta
+      memory.resident_server_cmaui_3:
+      - server_cmaui_3
+      - memory.resident
+      network.outgoing.bytes.rate_cmaui_port_322:
+      - cmaui_port_322
+      - network.outgoing.bytes.rate
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      network.incoming.packets.rate_cmaui_port_322:
+      - cmaui_port_322
       - network.incoming.packets.rate
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      network.outgoing.bytes_cmaui_port_22:
-      - cmaui_port_22
-      - network.outgoing.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      network.incoming.packets_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.packets
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_11:
-      - cmaui_port_11
-      - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
+      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
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      link_cmaui_port_11:
-      - cmaui_port_11
+      link_cmaui_port_311:
+      - cmaui_port_311
       - link
-      link_cmaui_port_22:
-      - cmaui_port_22
+      link_cmaui_port_322:
+      - cmaui_port_322
       - link
-      dependency_cmaui_port_11:
-      - cmaui_port_11
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
+      dependency_cmaui_port_311:
+      - cmaui_port_311
       - dependency
-      dependency_cmaui_port_22:
-      - cmaui_port_22
+      dependency_cmaui_port_322:
+      - cmaui_port_322
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
index 8b1dfeb..59c7bc8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -80,20 +80,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    test_nested2:
-      type: org.openecomp.resource.abstract.nodes.heat.nested2level
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: nested2levelServiceTemplate.yaml
-        p2:
-          get_input: p2
-        shared_security_group_id1:
-          get_input: shared_security_group_id1
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -106,6 +95,17 @@ topology_template:
           get_input:
           - cmaui_names
           - 0
+    test_nested2:
+      type: org.openecomp.resource.abstract.nodes.heat.nested2level
+      directives:
+      - substitutable
+      properties:
+        service_template_filter:
+          substitute_service_template: nested2levelServiceTemplate.yaml
+        p2:
+          get_input: p2
+        shared_security_group_id1:
+          get_input: shared_security_group_id1
     cmaui_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -132,7 +132,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_group:
@@ -142,643 +142,643 @@ topology_template:
         description: cmaui server template for vMMSC
       members:
       - cmaui_port_2
+      - server_cmaui_1
       - test_nested2
-      - server_cmaui
       - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      network.incoming.packets.rate_cmaui_port_22_test_nested2:
+      disk.iops_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.packets.rate_cmaui_port_22
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.read.bytes_server_cmaui_test_nested3_test_nested2:
+      - disk.iops_server_cmaui_3_test_nested3
+      network.outpoing.packets_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.outpoing.packets_cmaui_port_222
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      memory.usage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.read.bytes_server_cmaui_test_nested3
+      - memory.usage_server_cmaui_3_test_nested3
       feature_test_nested3_test_nested2:
       - test_nested2
       - feature_test_nested3
-      disk.write.requests.rate_server_cmaui_test_nested2:
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.usage_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested2:
+      - disk.device.usage_server_cmaui_2
+      host_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.capacity_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.latency_server_cmaui_test_nested2:
+      - host_server_cmaui_2
+      disk.root.size_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.latency_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested2:
+      - disk.root.size_server_cmaui_2
+      endpoint_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.read.bytes.rate_server_cmaui
-      memory_server_cmaui_test_nested3_test_nested2:
+      - endpoint_server_cmaui_3_test_nested3
+      feature_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - memory_server_cmaui_test_nested3
-      instance_server_cmaui_test_nested3_test_nested2:
+      - feature_cmaui_port_311_test_nested3
+      memory_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - instance_server_cmaui_test_nested3
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      binding_cmaui_port_11_test_nested2:
+      - memory_server_cmaui_3_test_nested3
+      network.outgoing.bytes_cmaui_port_222_test_nested2:
       - test_nested2
-      - binding_cmaui_port_11
-      endpoint_server_cmaui_test_nested2:
+      - network.outgoing.bytes_cmaui_port_222
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - endpoint_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested2:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      feature_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.read.bytes_server_cmaui
-      feature_cmaui_port_11_test_nested3_test_nested2:
+      - feature_cmaui_port_322_test_nested3
+      binding_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - feature_cmaui_port_11_test_nested3
-      feature_cmaui_port_22_test_nested3_test_nested2:
+      - binding_cmaui_port_322_test_nested3
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - feature_cmaui_port_22_test_nested3
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - network.outpoing.packets_cmaui_port_311_test_nested3
+      binding_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_311_test_nested3
+      network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.outpoing.packets_cmaui_port_322_test_nested3
+      disk.write.bytes.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.iops_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.iops_server_cmaui_2
+      network.outgoing.packets.rate_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.packets.rate_cmaui_port_322_test_nested3
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
+      network.outgoing.packets.rate_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - network.outgoing.packets.rate_cmaui_port_311_test_nested3
+      network.outgoing.packets.rate_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.outgoing.packets.rate_cmaui_port_222
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
-      memory.usage_server_cmaui_test_nested2:
+      cpu.delta_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - memory.usage_server_cmaui
-      network.outpoing.packets_cmaui_port_11_test_nested3_test_nested2:
+      - cpu.delta_server_cmaui_3_test_nested3
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      network.incoming.packets_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - network.outpoing.packets_cmaui_port_11_test_nested3
-      disk.device.iops_server_cmaui_test_nested3_test_nested2:
+      - network.incoming.packets_cmaui_port_311_test_nested3
+      disk.device.allocation_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.iops_server_cmaui_test_nested3
-      network.incoming.packets.rate_cmaui_port_11_test_nested2:
+      - disk.device.allocation_server_cmaui_3_test_nested3
+      disk.latency_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.packets.rate_cmaui_port_11
-      disk.device.read.requests_server_cmaui_test_nested3_test_nested2:
+      - disk.latency_server_cmaui_3_test_nested3
+      disk.allocation_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.read.requests_server_cmaui_test_nested3
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      - disk.allocation_server_cmaui_2
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      host_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - host_server_cmaui_3_test_nested3
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
       - disk.device.read.bytes
-      cpu_util_server_cmaui_test_nested3_test_nested2:
+      cpu_server_cmaui_2_test_nested2:
       - test_nested2
-      - cpu_util_server_cmaui_test_nested3
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested3_test_nested2:
+      - cpu_server_cmaui_2
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes.rate_server_cmaui_2
+      disk.device.read.bytes_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_22_test_nested3
-      binding_cmaui_port_22_test_nested2:
+      - disk.device.read.bytes_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
+      network.outgoing.packets.rate_cmaui_port_211_test_nested2:
       - test_nested2
-      - binding_cmaui_port_22
-      disk.allocation_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.packets.rate_cmaui_port_211
+      endpoint_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.allocation_server_cmaui_test_nested3
-      binding_server_cmaui_test_nested2:
+      - endpoint_server_cmaui_2
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - binding_server_cmaui
-      disk.capacity_server_cmaui_test_nested3_test_nested2:
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3
+      cpu.delta_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.capacity_server_cmaui_test_nested3
-      os_server_cmaui_test_nested3_test_nested2:
+      - cpu.delta_server_cmaui_2
+      instance_server_cmaui_2_test_nested2:
+      - test_nested2
+      - instance_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - os_server_cmaui_test_nested3
+      - network.incoming.packets.rate_cmaui_port_311_test_nested3
+      feature_cmaui_port_211_test_nested2:
+      - test_nested2
+      - feature_cmaui_port_211
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      binding_server_cmaui_test_nested3_test_nested2:
+      memory.usage_server_cmaui_2_test_nested2:
       - test_nested2
-      - binding_server_cmaui_test_nested3
-      disk.ephemeral.size_server_cmaui_test_nested3_test_nested2:
+      - memory.usage_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.ephemeral.size_server_cmaui_test_nested3
-      disk.write.requests.rate_server_cmaui_test_nested3_test_nested2:
+      - disk.write.requests.rate_server_cmaui_2
+      disk.capacity_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.write.requests.rate_server_cmaui_test_nested3
-      disk.allocation_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.allocation_server_cmaui
+      - disk.capacity_server_cmaui_3_test_nested3
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      network.outgoing.bytes_cmaui_port_11_test_nested3_test_nested2:
+      disk.device.write.bytes_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.write.bytes_server_cmaui_2
+      disk.write.requests_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.outgoing.bytes_cmaui_port_11_test_nested3
-      network.incoming.bytes.rate_cmaui_port_22_test_nested2:
+      - disk.write.requests_server_cmaui_3_test_nested3
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_22
-      disk.read.requests_server_cmaui_test_nested2:
+      - disk.capacity_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.read.requests_server_cmaui
-      network.outgoing.bytes_cmaui_port_22_test_nested3_test_nested2:
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3
+      disk.latency_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.outgoing.bytes_cmaui_port_22_test_nested3
-      disk.write.requests_server_cmaui_test_nested2:
+      - disk.latency_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.requests_server_cmaui
-      network.outpoing.packets_cmaui_port_11_test_nested2:
+      - disk.read.bytes.rate_server_cmaui_2
+      network.incoming.bytes.rate_cmaui_port_211_test_nested2:
       - test_nested2
-      - network.outpoing.packets_cmaui_port_11
-      os_server_cmaui_test_nested2:
+      - network.incoming.bytes.rate_cmaui_port_211
+      disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - os_server_cmaui
-      feature_cmaui_port_22_test_nested2:
+      - disk.ephemeral.size_server_cmaui_3_test_nested3
+      disk.device.read.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - feature_cmaui_port_22
-      cpu_util_server_cmaui_test_nested2:
+      - disk.device.read.requests_server_cmaui_2
+      binding_cmaui_port_211_test_nested2:
       - test_nested2
-      - cpu_util_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - binding_cmaui_port_211
+      binding_server_cmaui_2_test_nested2:
+      - test_nested2
+      - binding_server_cmaui_2
+      os_server_cmaui_2_test_nested2:
+      - test_nested2
+      - os_server_cmaui_2
+      attachment_cmaui_port_211_test_nested2:
+      - test_nested2
+      - attachment_cmaui_port_211
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      disk.iops_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.iops_server_cmaui_test_nested3
-      disk.device.allocation_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.allocation_server_cmaui_test_nested3
-      network.outpoing.packets_cmaui_port_22_test_nested3_test_nested2:
-      - test_nested2
-      - network.outpoing.packets_cmaui_port_22_test_nested3
-      network.incoming.packets.rate_cmaui_port_22_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.packets.rate_cmaui_port_22_test_nested3
-      disk.write.bytes_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.write.bytes_server_cmaui
-      network.incoming.packets_cmaui_port_22_test_nested3_test_nested2:
+      disk.ephemeral.size_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.incoming.packets_cmaui_port_22_test_nested3
-      vcpus_server_cmaui_test_nested2:
+      - disk.ephemeral.size_server_cmaui_2
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      vcpus_server_cmaui_2_test_nested2:
       - test_nested2
-      - vcpus_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      disk.root.size_server_cmaui_test_nested3_test_nested2:
+      - vcpus_server_cmaui_2
+      binding_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.root.size_server_cmaui_test_nested3
+      - binding_server_cmaui_3_test_nested3
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      disk.device.write.requests.rate_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.write.requests.rate_server_cmaui_test_nested3
-      cpu_server_cmaui_test_nested2:
-      - test_nested2
-      - cpu_server_cmaui
-      memory.resident_server_cmaui_test_nested2:
-      - test_nested2
-      - memory.resident_server_cmaui
-      cpu_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - cpu_server_cmaui_test_nested3
-      network.outgoing.packets.rate_cmaui_port_22_test_nested2:
-      - test_nested2
-      - network.outgoing.packets.rate_cmaui_port_22
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
-      disk.write.requests_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.write.requests_server_cmaui_test_nested3
-      disk.device.latency_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.latency_server_cmaui_test_nested3
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested2:
-      - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_11
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      host_server_cmaui_test_nested2:
+      network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - host_server_cmaui
-      disk.usage_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.usage_server_cmaui
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - network.outgoing.bytes_cmaui_port_322_test_nested3
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_11_test_nested3
-      disk.read.bytes_server_cmaui_test_nested3_test_nested2:
+      cpu_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.read.bytes_server_cmaui_test_nested3
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      - cpu_server_cmaui_3_test_nested3
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
-      disk.write.bytes.rate_server_cmaui_test_nested3_test_nested2:
+      network.incoming.packets_cmaui_port_222_test_nested2:
       - test_nested2
-      - disk.write.bytes.rate_server_cmaui_test_nested3
-      binding_cmaui_port_22_test_nested3_test_nested2:
+      - network.incoming.packets_cmaui_port_222
+      network.incoming.packets.rate_cmaui_port_222_test_nested2:
       - test_nested2
-      - binding_cmaui_port_22_test_nested3
-      disk.ephemeral.size_server_cmaui_test_nested2:
+      - network.incoming.packets.rate_cmaui_port_222
+      network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - disk.ephemeral.size_server_cmaui
-      binding_cmaui_port_11_test_nested3_test_nested2:
+      - network.incoming.packets.rate_cmaui_port_322_test_nested3
+      network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - binding_cmaui_port_11_test_nested3
-      disk.read.requests_server_cmaui_test_nested3_test_nested2:
+      - network.incoming.bytes.rate_cmaui_port_311_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_222_test_nested2:
       - test_nested2
-      - disk.read.requests_server_cmaui_test_nested3
-      scalable_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.bytes.rate_cmaui_port_222
+      network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - scalable_server_cmaui_test_nested3
-      network.incoming.packets_cmaui_port_11_test_nested2:
+      - network.incoming.bytes.rate_cmaui_port_322_test_nested3
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      disk.read.bytes_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.packets_cmaui_port_11
-      network.incoming.bytes_cmaui_port_11_test_nested2:
+      - disk.read.bytes_server_cmaui_3_test_nested3
+      memory.resident_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.bytes_cmaui_port_11
-      vcpus_server_cmaui_test_nested3_test_nested2:
+      - memory.resident_server_cmaui_3_test_nested3
+      disk.device.latency_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - vcpus_server_cmaui_test_nested3
-      host_server_cmaui_test_nested3_test_nested2:
+      - disk.device.latency_server_cmaui_3_test_nested3
+      attachment_cmaui_port_222_test_nested2:
       - test_nested2
-      - host_server_cmaui_test_nested3
-      disk.device.read.requests.rate_server_cmaui_test_nested2:
+      - attachment_cmaui_port_222
+      network.incoming.bytes_cmaui_port_222_test_nested2:
       - test_nested2
-      - disk.device.read.requests.rate_server_cmaui
+      - network.incoming.bytes_cmaui_port_222
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      feature_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - feature_server_cmaui_3_test_nested3
+      network.incoming.bytes.rate_cmaui_port_222_test_nested2:
+      - test_nested2
+      - network.incoming.bytes.rate_cmaui_port_222
+      attachment_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - attachment_cmaui_port_311_test_nested3
       feature_cmaui_port_1:
       - cmaui_port_1
       - feature
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      network.outgoing.packets.rate_cmaui_port_22_test_nested3_test_nested2:
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      attachment_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - network.outgoing.packets.rate_cmaui_port_22_test_nested3
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      network.outgoing.packets.rate_cmaui_port_11_test_nested3_test_nested2:
+      - attachment_cmaui_port_322_test_nested3
+      disk.device.capacity_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.capacity_server_cmaui_3_test_nested3
+      cpu_util_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.outgoing.packets.rate_cmaui_port_11_test_nested3
-      disk.device.write.bytes_server_cmaui_test_nested2:
+      - cpu_util_server_cmaui_2
+      network.incoming.packets_cmaui_port_211_test_nested2:
       - test_nested2
-      - disk.device.write.bytes_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_11_test_nested2:
+      - network.incoming.packets_cmaui_port_211
+      disk.device.iops_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_11
+      - disk.device.iops_server_cmaui_2
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_311_test_nested3
+      scalable_server_cmaui_2_test_nested2:
+      - test_nested2
+      - scalable_server_cmaui_2
+      network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_322_test_nested3
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      scalable_server_cmaui_test_nested2:
-      - test_nested2
-      - scalable_server_cmaui
       feature_test_nested2:
       - test_nested2
       - feature
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      attachment_cmaui_port_22_test_nested2:
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - attachment_cmaui_port_22
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
       network.outgoing.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.packets.rate
-      disk.device.allocation_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.device.allocation_server_cmaui
-      disk.read.bytes_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.read.bytes_server_cmaui
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      memory_server_cmaui_test_nested2:
+      disk.device.usage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - memory_server_cmaui
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      network.incoming.packets_cmaui_port_11_test_nested3_test_nested2:
+      - disk.device.usage_server_cmaui_3_test_nested3
+      disk.write.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.incoming.packets_cmaui_port_11_test_nested3
-      disk.device.read.requests_server_cmaui_test_nested2:
+      - disk.write.requests_server_cmaui_2
+      disk.root.size_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.read.requests_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_22_test_nested3_test_nested2:
+      - disk.root.size_server_cmaui_3_test_nested3
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.bytes.rate_cmaui_port_22_test_nested3
-      disk.device.read.bytes.rate_server_cmaui_test_nested2:
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      feature_cmaui_port_222_test_nested2:
       - test_nested2
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.usage_server_cmaui_test_nested3_test_nested2:
+      - feature_cmaui_port_222
+      disk.read.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.usage_server_cmaui_test_nested3
-      disk.device.latency_server_cmaui_test_nested2:
+      - disk.read.requests_server_cmaui_2
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
+      disk.device.capacity_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.latency_server_cmaui
-      network.outgoing.bytes_cmaui_port_11_test_nested2:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - network.outgoing.bytes_cmaui_port_11
-      disk.latency_server_cmaui_test_nested3_test_nested2:
+      - disk.device.read.requests.rate_server_cmaui_2
+      memory.resident_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.latency_server_cmaui_test_nested3
-      disk.device.write.bytes.rate_server_cmaui_test_nested2:
+      - memory.resident_server_cmaui_2
+      disk.usage_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.write.bytes.rate_server_cmaui
-      instance_server_cmaui_test_nested2:
+      - disk.usage_server_cmaui_2
+      disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - instance_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      attachment_cmaui_port_11_test_nested3_test_nested2:
+      - disk.device.read.requests_server_cmaui_3_test_nested3
+      os_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - attachment_cmaui_port_11_test_nested3
-      network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2:
+      - os_server_cmaui_3_test_nested3
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      network.outgoing.bytes.rate_cmaui_port_211_test_nested2:
       - test_nested2
-      - network.incoming.bytes_cmaui_port_22_test_nested3
-      disk.write.bytes.rate_server_cmaui_test_nested2:
+      - network.outgoing.bytes.rate_cmaui_port_211
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.usage_server_cmaui_test_nested2:
+      - disk.device.write.requests.rate_server_cmaui_2
+      feature_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.usage_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.iops_server_cmaui_test_nested2:
+      - feature_server_cmaui_2
+      memory_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.iops_server_cmaui
-      memory.usage_server_cmaui_test_nested3_test_nested2:
+      - memory_server_cmaui_2
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
+      network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - memory.usage_server_cmaui_test_nested3
-      disk.device.write.bytes_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.bytes_cmaui_port_311_test_nested3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.write.bytes_server_cmaui_test_nested3
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      network.incoming.packets.rate_cmaui_port_11_test_nested3_test_nested2:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.iops_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.incoming.packets.rate_cmaui_port_11_test_nested3
-      feature_server_cmaui_test_nested2:
+      - disk.device.iops_server_cmaui_3_test_nested3
+      disk.device.write.requests_server_cmaui_2_test_nested2:
       - test_nested2
-      - feature_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3_test_nested2:
+      - disk.device.write.requests_server_cmaui_2
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
+      network.incoming.packets.rate_cmaui_port_211_test_nested2:
       - test_nested2
-      - disk.write.bytes_server_cmaui_test_nested3
-      disk.device.read.requests.rate_server_cmaui_test_nested3_test_nested2:
+      - network.incoming.packets.rate_cmaui_port_211
+      disk.read.bytes_server_cmaui_2_test_nested2:
       - test_nested2
-      - disk.device.read.requests.rate_server_cmaui_test_nested3
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      disk.device.iops_server_cmaui_test_nested2:
+      - disk.read.bytes_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.iops_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested2:
+      - disk.allocation_server_cmaui_3_test_nested3
+      vcpus_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.write.requests.rate_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_11_test_nested2:
+      - vcpus_server_cmaui_3_test_nested3
+      network.outgoing.bytes_cmaui_port_211_test_nested2:
       - test_nested2
-      - network.outgoing.packets.rate_cmaui_port_11
-      feature_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.bytes_cmaui_port_211
+      disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - feature_server_cmaui_test_nested3
-      disk.device.capacity_server_cmaui_test_nested3_test_nested2:
+      - disk.device.write.requests_server_cmaui_3_test_nested3
+      disk.read.requests_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.capacity_server_cmaui_test_nested3
-      attachment_cmaui_port_22_test_nested3_test_nested2:
+      - disk.read.requests_server_cmaui_3_test_nested3
+      instance_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - attachment_cmaui_port_22_test_nested3
-      disk.device.write.requests_server_cmaui_test_nested2:
+      - instance_server_cmaui_3_test_nested3
+      disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.write.requests_server_cmaui
-      network.outgoing.bytes_cmaui_port_22_test_nested2:
+      - disk.write.requests.rate_server_cmaui_3_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - network.outgoing.bytes_cmaui_port_22
-      cpu.delta_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.bytes.rate_cmaui_port_311_test_nested3
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.latency_server_cmaui_2_test_nested2:
       - test_nested2
-      - cpu.delta_server_cmaui_test_nested3
-      endpoint_server_cmaui_test_nested3_test_nested2:
+      - disk.device.latency_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - endpoint_server_cmaui_test_nested3
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.device.write.bytes.rate_server_cmaui_test_nested3_test_nested2:
+      - disk.usage_server_cmaui_3_test_nested3
+      network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3
-      disk.device.usage_server_cmaui_test_nested3_test_nested2:
+      - network.outgoing.bytes.rate_cmaui_port_322_test_nested3
+      disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.usage_server_cmaui_test_nested3
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
+      - disk.device.read.bytes_server_cmaui_3_test_nested3
+      network.outpoing.packets_cmaui_port_211_test_nested2:
       - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_22
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      - network.outpoing.packets_cmaui_port_211
+      disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - disk.device.write.bytes_server_cmaui_3_test_nested3
+      disk.device.allocation_server_cmaui_2_test_nested2:
+      - test_nested2
+      - disk.device.allocation_server_cmaui_2
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
+      network.incoming.bytes_cmaui_port_211_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_211
+      binding_cmaui_port_222_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_222
+      scalable_server_cmaui_3_test_nested3_test_nested2:
+      - test_nested2
+      - scalable_server_cmaui_3_test_nested3
       network.incoming.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes.rate
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.read.bytes.rate_server_cmaui_test_nested3
-      disk.device.read.bytes.rate_server_cmaui_test_nested3_test_nested2:
+      network.incoming.packets_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3
-      disk.root.size_server_cmaui_test_nested2:
-      - test_nested2
-      - disk.root.size_server_cmaui
-      memory.resident_server_cmaui_test_nested3_test_nested2:
+      - network.incoming.packets_cmaui_port_322_test_nested3
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.bytes_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - memory.resident_server_cmaui_test_nested3
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      - disk.write.bytes_server_cmaui_3_test_nested3
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
-      network.incoming.packets_cmaui_port_22_test_nested2:
-      - test_nested2
-      - network.incoming.packets_cmaui_port_22
-      network.incoming.bytes_cmaui_port_22_test_nested2:
-      - test_nested2
-      - network.incoming.bytes_cmaui_port_22
-      cpu.delta_server_cmaui_test_nested2:
-      - test_nested2
-      - cpu.delta_server_cmaui
-      network.incoming.bytes_cmaui_port_11_test_nested3_test_nested2:
-      - test_nested2
-      - network.incoming.bytes_cmaui_port_11_test_nested3
-      network.outpoing.packets_cmaui_port_22_test_nested2:
-      - test_nested2
-      - network.outpoing.packets_cmaui_port_22
-      disk.device.write.requests_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - disk.device.write.requests_server_cmaui_test_nested3
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      feature_cmaui_port_11_test_nested2:
-      - test_nested2
-      - feature_cmaui_port_11
-      attachment_cmaui_port_11_test_nested2:
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      disk.write.bytes_server_cmaui_2_test_nested2:
       - test_nested2
-      - attachment_cmaui_port_11
-      network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2:
+      - disk.write.bytes_server_cmaui_2
+      cpu_util_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - network.outgoing.bytes.rate_cmaui_port_11_test_nested3
-      disk.device.capacity_server_cmaui_test_nested2:
+      - cpu_util_server_cmaui_3_test_nested3
+      disk.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - disk.device.capacity_server_cmaui
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_cmaui_port_22_test_nested2:
-      - test_nested2
-      - dependency_cmaui_port_22
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      dependency_server_cmaui_test_nested2:
+      link_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - dependency_server_cmaui
-      link_cmaui_port_22_test_nested2:
+      - link_cmaui_port_311_test_nested3
+      dependency_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - link_cmaui_port_22
-      dependency_cmaui_port_22_test_nested3_test_nested2:
+      - dependency_cmaui_port_322_test_nested3
+      link_cmaui_port_322_test_nested3_test_nested2:
       - test_nested2
-      - dependency_cmaui_port_22_test_nested3
-      dependency_cmaui_port_11_test_nested2:
+      - link_cmaui_port_322_test_nested3
+      dependency_cmaui_port_222_test_nested2:
       - test_nested2
-      - dependency_cmaui_port_11
+      - dependency_cmaui_port_222
       link_cmaui_port_2:
       - cmaui_port_2
       - link
       link_cmaui_port_1:
       - cmaui_port_1
       - link
-      dependency_cmaui_port_11_test_nested3_test_nested2:
+      dependency_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - dependency_cmaui_port_11_test_nested3
-      local_storage_server_cmaui_test_nested2:
+      - dependency_server_cmaui_3_test_nested3
+      dependency_cmaui_port_311_test_nested3_test_nested2:
       - test_nested2
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3_test_nested2:
-      - test_nested2
-      - dependency_server_cmaui_test_nested3
-      local_storage_server_cmaui:
-      - server_cmaui
+      - dependency_cmaui_port_311_test_nested3
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
       - local_storage
-      link_cmaui_port_11_test_nested3_test_nested2:
+      dependency_server_cmaui_2_test_nested2:
+      - test_nested2
+      - dependency_server_cmaui_2
+      dependency_cmaui_port_211_test_nested2:
       - test_nested2
-      - link_cmaui_port_11_test_nested3
+      - dependency_cmaui_port_211
+      local_storage_server_cmaui_2_test_nested2:
+      - test_nested2
+      - local_storage_server_cmaui_2
       dependency_test_nested2:
       - test_nested2
       - dependency
-      link_cmaui_port_22_test_nested3_test_nested2:
+      local_storage_server_cmaui_3_test_nested3_test_nested2:
       - test_nested2
-      - link_cmaui_port_22_test_nested3
+      - local_storage_server_cmaui_3_test_nested3
       dependency_cmaui_port_1:
       - cmaui_port_1
       - dependency
-      local_storage_server_cmaui_test_nested3_test_nested2:
+      link_cmaui_port_222_test_nested2:
       - test_nested2
-      - local_storage_server_cmaui_test_nested3
+      - link_cmaui_port_222
       dependency_test_nested3_test_nested2:
       - test_nested2
       - dependency_test_nested3
-      link_cmaui_port_11_test_nested2:
-      - test_nested2
-      - link_cmaui_port_11
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_2:
       - cmaui_port_2
-      - dependency
\ No newline at end of file
+      - dependency
+      link_cmaui_port_211_test_nested2:
+      - test_nested2
+      - link_cmaui_port_211
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml
index b202fef..b15724a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml
index 14c137a..6698868 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml
@@ -31,7 +31,7 @@ parameters:
 
 resources:
 
-  cmaui_port_11:
+  cmaui_port_211:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -39,7 +39,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}, {get_param: p2}]
       replacement_policy: AUTO
 
-  cmaui_port_22:
+  cmaui_port_222:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -55,8 +55,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_11 }
-      - port: { get_resource: cmaui_port_22 }
+      - port: { get_resource: cmaui_port_211 }
+      - port: { get_resource: cmaui_port_222 }
 
   test_nested3:
     type: nested3level.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml
index 6a123d1..47fa4d3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml
@@ -31,7 +31,7 @@ parameters:
 
 resources:
 
-  cmaui_port_11:
+  cmaui_port_311:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -39,7 +39,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}, {get_param: p2}]
       replacement_policy: AUTO
 
-  cmaui_port_22:
+  cmaui_port_322:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: shared_security_group_id1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -55,5 +55,5 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_11 }
-      - port: { get_resource: cmaui_port_22 }
\ No newline at end of file
+      - port: { get_resource: cmaui_port_311 }
+      - port: { get_resource: cmaui_port_322 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0290522..435c42a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -68,14 +68,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -95,52 +95,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_network_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_network:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+    - link_pcm_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
-        - UNBOUNDED
+        - 1
+    capabilities:
       cpu_server_pcm:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_1:
+      memory_server_pcm:
         type: org.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_pcm:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -152,179 +145,176 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcm:
+      network.incoming.packets_pcm_port_00:
         type: org.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_pcm:
+      disk.device.iops_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      memory.resident_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_network_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
+      disk.device.write.requests_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_network_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      disk.allocation_server_pcm:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      memory.usage_server_pcm:
+      disk.usage_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.device.write.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      link_network:
-        type: tosca.capabilities.network.Linkable
+      network.outgoing.bytes_pcm_port_00:
+        type: org.openecomp.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_pcm:
+      disk.root.size_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.ephemeral.size_server_pcm:
+        type: org.openecomp.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_pcm:
+      disk.device.latency_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      link_network_2:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.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_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -333,14 +323,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      network.incoming.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_network:
-        type: tosca.capabilities.Endpoint
+      disk.device.read.requests.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -350,11 +341,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_network:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -384,78 +370,87 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_network:
-        type: tosca.capabilities.Node
+      disk.device.read.bytes.rate_server_pcm:
+        type: org.openecomp.capabilities.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_pcm:
+      cpu_util_server_pcm:
         type: org.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_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      cpu.delta_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -490,7 +485,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -502,7 +497,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      end_point_network_2:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -605,20 +605,13 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_network_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_server_pcm_005:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -626,14 +619,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_1_server_pcm_005:
+    - dependency_pcm_port_00_server_pcm_005:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1_server_pcm_005:
+    - link_pcm_port_00_server_pcm_005:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -653,26 +646,40 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0_server_pcm_005:
+    - dependency_network_2_server_pcm_005:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0_server_pcm_005:
+    - dependency_pcm_port_01_server_pcm_005:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pcm_port_01_server_pcm_005:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_network_server_pcm_005:
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - local_storage_server_pcm_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_pcm_port_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -686,14 +693,13 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_network:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      network.incoming.bytes.rate_pcm_port_01_server_pcm_005:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    capabilities:
       network.incoming.packets.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -717,73 +723,48 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
-        type: org.openecomp.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_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm_server_pcm_005:
-        type: org.openecomp.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_pcm_port_1_server_pcm_005:
+      network.outgoing.bytes_pcm_port_01_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.write.bytes_server_pcm_server_pcm_005:
         type: org.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_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      link_network_server_pcm_005:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory_server_pcm_server_pcm_005:
         type: org.openecomp.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_pcm_port_1_server_pcm_005:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
+      network.incoming.packets.rate_pcm_port_00_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm_server_pcm_005:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_network_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1_server_pcm_005:
+      disk.device.read.requests.rate_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -794,17 +775,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.usage_server_pcm:
-        type: org.openecomp.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_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -817,31 +787,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pcm:
+      network.incoming.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0_server_pcm_005:
+      disk.write.requests_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm_server_pcm_005:
+      memory.resident_server_pcm_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:
@@ -873,24 +843,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      memory.usage_server_pcm:
-        type: org.openecomp.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_pcm_port_1_server_pcm_005:
-        type: org.openecomp.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_pcm:
-        type: org.openecomp.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_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -903,27 +855,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcm_port_00_server_pcm_005:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0_server_pcm_005:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      link_network_1:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1_server_pcm_005:
+      disk.device.latency_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm_server_pcm_005:
-        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_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -939,18 +890,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_1:
-        type: tosca.capabilities.Node
+      link_network_2_server_pcm_005:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.outgoing.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -961,12 +911,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.Node
+      disk.device.read.requests_server_pcm_server_pcm_005:
+        type: org.openecomp.capabilities.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_pcm_server_pcm_005:
+      cpu_server_pcm_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:
@@ -988,18 +939,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1_server_pcm_005:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.usage_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm:
+      network.outgoing.bytes_pcm_port_00_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1011,18 +957,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pcm:
+      endpoint_server_pcm_1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcm_port_01_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_network:
-        type: tosca.capabilities.Attachment
+      host_server_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      disk.device.capacity_server_pcm_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:
@@ -1034,66 +987,68 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.allocation_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes.rate_pcm_port_00_server_pcm_005:
+        type: org.openecomp.capabilities.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_pcm:
+      disk.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm_server_pcm_005:
+      vcpus_server_pcm_server_pcm_005:
         type: org.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_pcm:
-        type: tosca.capabilities.Scalable
+      disk.write.requests.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_network:
-        type: tosca.capabilities.Node
+      attachment_pcm_port_01_server_pcm_005:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      memory_server_pcm_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_pcm_server_pcm_005:
+      network.incoming.packets_pcm_port_00_server_pcm_005:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.bytes_pcm_port_00_server_pcm_005:
+        type: org.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_pcm:
+      network.outpoing.packets_pcm_port_00_server_pcm_005:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes.rate_server_pcm_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
@@ -1103,60 +1058,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.usage_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm_server_pcm_005:
+      network.outgoing.packets.rate_pcm_port_01_server_pcm_005:
         type: org.openecomp.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_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_1_server_pcm_005:
+      cpu_util_server_pcm_server_pcm_005:
         type: org.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_pcm_server_pcm_005:
+      disk.ephemeral.size_server_pcm_server_pcm_005:
         type: org.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_pcm:
-        type: tosca.capabilities.Node
+      end_point_network_1:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm_server_pcm_005:
-        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_pcm_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcm:
+      disk.write.bytes.rate_server_pcm_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:
@@ -1168,7 +1122,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0_server_pcm_005:
+      disk.device.allocation_server_pcm_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:
@@ -1180,12 +1134,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_network_server_pcm_005:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0_server_pcm_005:
+      disk.root.size_server_pcm_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:
@@ -1197,12 +1146,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
-        type: org.openecomp.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_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1216,9 +1159,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0_server_pcm_005:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_network_2_server_pcm_005:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_port_01_server_pcm_005:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1238,21 +1185,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      cpu_server_pcm_server_pcm_005:
         type: org.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_pcm_server_pcm_005:
+      binding_pcm_port_01_server_pcm_005:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_network_2_server_pcm_005:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -1262,15 +1215,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_network_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_pcm_port_00_server_pcm_005:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      end_point_network_2_server_pcm_005:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
@@ -1279,37 +1241,39 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0_server_pcm_005:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      cpu_util_server_pcm_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
-      link_network:
-        type: tosca.capabilities.network.Linkable
+      disk.allocation_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.device.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      memory.usage_server_pcm_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
@@ -1319,23 +1283,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_0_server_pcm_005:
+      disk.device.read.bytes_server_pcm_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
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.write.requests_server_pcm_server_pcm_005:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_network:
-        type: tosca.capabilities.Endpoint
+      disk.read.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm_server_pcm_005:
+      disk.device.iops_server_pcm_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:
@@ -1347,61 +1313,76 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      disk.device.capacity_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm_server_pcm_005:
+      cpu.delta_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1_server_pcm_005:
+      network.outpoing.packets_pcm_port_01_server_pcm_005:
         type: org.openecomp.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_pcm_port_0_server_pcm_005:
+      network.incoming.bytes.rate_pcm_port_00_server_pcm_005:
         type: org.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_pcm_server_pcm_005:
+      disk.read.requests_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_port_00_server_pcm_005:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.ephemeral.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_server_pcm_server_pcm_005:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_server_pcm_server_pcm_005:
         type: org.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_pcm_port_0_server_pcm_005:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01_server_pcm_005:
         type: org.openecomp.capabilities.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_pcm:
+      network.outgoing.packets.rate_pcm_port_00_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1413,24 +1394,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1_server_pcm_005:
+      disk.device.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_network_server_pcm_005:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes.rate_pcm_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      network.incoming.packets_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.usage_server_pcm_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:
@@ -1442,8 +1424,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_network_server_pcm_005:
-        type: tosca.capabilities.Endpoint
+      disk.device.write.requests_server_pcm_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
@@ -1459,12 +1442,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      network.incoming.bytes_pcm_port_01_server_pcm_005:
         type: org.openecomp.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_pcm_port_01_server_pcm_005:
+        type: org.openecomp.capabilities.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_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index 480a645..a1c67fb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -125,21 +125,13 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+    network_1:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
       properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
+        network_name:
+          get_input: cps_net_name
     server_pcm_005:
       type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2
       directives:
@@ -163,6 +155,19 @@ topology_template:
           get_input: cps_net_name
         cps_net_mask:
           get_input: cps_net_mask
+    server_pcm_1:
+      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -186,13 +191,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    network:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        network_name:
-          get_input: cps_net_name
   groups:
     nested-pcm_v0.1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -201,17 +201,20 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - pcm_port_1
-      - server_pcm
+      - network_1
       - server_pcm_005
+      - server_pcm_1
       - pcm_port_0
-      - network
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
     capabilities:
+      network.incoming.bytes.rate_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.bytes.rate_pcm_port_01
       network.incoming.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets.rate
@@ -224,72 +227,54 @@ topology_template:
       network.outpoing.packets_pcm_port_1:
       - pcm_port_1
       - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
       network.outpoing.packets_pcm_port_0:
       - pcm_port_0
       - network.outpoing.packets
+      network.outgoing.bytes_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.outgoing.bytes_pcm_port_01
       disk.device.write.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.write.bytes_server_pcm
-      network.incoming.bytes.rate_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.bytes.rate_pcm_port_1
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      binding_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - binding_pcm_port_1
-      link_network_server_pcm_005:
-      - server_pcm_005
-      - link_network
       memory_server_pcm_server_pcm_005:
       - server_pcm_005
       - memory_server_pcm
-      network.outgoing.packets.rate_pcm_port_1_server_pcm_005:
+      disk.capacity_server_pcm_1:
+      - server_pcm_1
+      - disk.capacity
+      network.incoming.packets.rate_pcm_port_00_server_pcm_005:
       - server_pcm_005
-      - network.outgoing.packets.rate_pcm_port_1
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
+      - network.incoming.packets.rate_pcm_port_00
+      feature_network_1:
+      - network_1
+      - feature
       disk.device.read.requests.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.read.requests.rate_server_pcm
-      network.outgoing.bytes_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - network.outgoing.bytes_pcm_port_1
       os_server_pcm_server_pcm_005:
       - server_pcm_005
       - os_server_pcm
-      feature_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - feature_pcm_port_0
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
       disk.read.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.read.bytes_server_pcm
       disk.device.write.bytes.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.write.bytes.rate_server_pcm
-      disk.root.size_server_pcm:
-      - server_pcm
-      - disk.root.size
-      network.incoming.packets_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.packets_pcm_port_0
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
       network.incoming.bytes_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes
       disk.write.requests_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.requests_server_pcm
+      disk.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.usage
+      vcpus_server_pcm_1:
+      - server_pcm_1
+      - vcpus
+      memory.resident_server_pcm_1:
+      - server_pcm_1
+      - memory.resident
       network.incoming.bytes_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes
@@ -302,57 +287,48 @@ topology_template:
       binding_pcm_port_1:
       - pcm_port_1
       - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      network.incoming.packets.rate_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.packets.rate_pcm_port_1
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
       disk.iops_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.iops_server_pcm
       disk.device.read.bytes.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.read.bytes.rate_server_pcm
-      disk.read.bytes_server_pcm:
-      - server_pcm
-      - disk.read.bytes
-      network.outgoing.bytes_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.outgoing.bytes_pcm_port_0
-      network.outgoing.bytes.rate_pcm_port_1_server_pcm_005:
+      binding_pcm_port_00_server_pcm_005:
       - server_pcm_005
-      - network.outgoing.bytes.rate_pcm_port_1
+      - binding_pcm_port_00
+      link_network_1:
+      - network_1
+      - link
       disk.device.latency_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.latency_server_pcm
+      feature_server_pcm_1:
+      - server_pcm_1
+      - feature
       network.outgoing.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.packets.rate
       network.outgoing.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.packets.rate
+      link_network_2_server_pcm_005:
+      - server_pcm_005
+      - link_network_2
       feature_pcm_port_1:
       - pcm_port_1
       - feature
       network.outgoing.bytes_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
       feature_pcm_port_0:
       - pcm_port_0
       - feature
-      feature_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - feature_pcm_port_1
       disk.device.read.requests_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.read.requests_server_pcm
+      cpu_server_pcm_1:
+      - server_pcm_1
+      - cpu
       network.outgoing.bytes_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes
@@ -362,126 +338,123 @@ topology_template:
       attachment_pcm_port_1:
       - pcm_port_1
       - attachment
-      attachment_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - attachment_pcm_port_1
       disk.device.usage_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.usage_server_pcm
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
+      network.outgoing.bytes_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.outgoing.bytes_pcm_port_00
       disk.read.requests_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.read.requests_server_pcm
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      attachment_network:
-      - network
-      - attachment
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
+      endpoint_server_pcm_1:
+      - server_pcm_1
+      - endpoint
+      network.incoming.packets.rate_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.packets.rate_pcm_port_01
+      host_server_pcm_1:
+      - server_pcm_1
+      - host
+      disk.device.capacity_server_pcm_1:
+      - server_pcm_1
+      - disk.device.capacity
       disk.write.bytes.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.bytes.rate_server_pcm
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.read.bytes.rate
-      attachment_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - attachment_pcm_port_0
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
       disk.allocation_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.allocation_server_pcm
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      feature_network:
-      - network
-      - feature
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
+      network.outgoing.bytes.rate_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.outgoing.bytes.rate_pcm_port_00
+      disk.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.latency
       vcpus_server_pcm_server_pcm_005:
       - server_pcm_005
       - vcpus_server_pcm
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
-      - cpu.delta
-      binding_server_pcm:
-      - server_pcm
-      - binding
+      disk.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests.rate
+      attachment_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - attachment_pcm_port_01
+      memory_server_pcm_1:
+      - server_pcm_1
+      - memory
+      network.incoming.packets_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.packets_pcm_port_00
+      network.incoming.bytes_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.bytes_pcm_port_00
+      network.outpoing.packets_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.outpoing.packets_pcm_port_00
+      disk.device.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes.rate
       disk.write.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.bytes_server_pcm
-      disk.device.capacity_server_pcm:
-      - server_pcm
-      - disk.device.capacity
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.requests.rate
       disk.usage_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.usage_server_pcm
-      disk.latency_server_pcm:
-      - server_pcm
-      - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
-      - disk.device.read.requests
-      network.outpoing.packets_pcm_port_1_server_pcm_005:
+      disk.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.write.bytes
+      network.outgoing.packets.rate_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - network.outpoing.packets_pcm_port_1
+      - network.outgoing.packets.rate_pcm_port_01
+      instance_server_pcm_1:
+      - server_pcm_1
+      - instance
+      disk.device.read.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests.rate
       cpu_util_server_pcm_server_pcm_005:
       - server_pcm_005
       - cpu_util_server_pcm
-      feature_server_pcm:
-      - server_pcm
-      - feature
       disk.ephemeral.size_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.ephemeral.size_server_pcm
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      end_point_network_1:
+      - network_1
+      - end_point
+      binding_server_pcm_1:
+      - server_pcm_1
+      - binding
+      disk.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.bytes.rate
       memory.resident_server_pcm_server_pcm_005:
       - server_pcm_005
       - memory.resident_server_pcm
-      network.incoming.bytes_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.bytes_pcm_port_0
+      disk.device.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.device.allocation
       disk.capacity_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.capacity_server_pcm
-      feature_network_server_pcm_005:
-      - server_pcm_005
-      - feature_network
-      network.outgoing.bytes.rate_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.outgoing.bytes.rate_pcm_port_0
+      disk.root.size_server_pcm_1:
+      - server_pcm_1
+      - disk.root.size
       disk.latency_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.latency_server_pcm
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
       disk.write.requests.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.requests.rate_server_pcm
       host_server_pcm_server_pcm_005:
       - server_pcm_005
       - host_server_pcm
-      network.outpoing.packets_pcm_port_0_server_pcm_005:
+      attachment_network_2_server_pcm_005:
+      - server_pcm_005
+      - attachment_network_2
+      feature_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - network.outpoing.packets_pcm_port_0
+      - feature_pcm_port_01
       disk.read.bytes.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.read.bytes.rate_server_pcm
@@ -491,123 +464,150 @@ topology_template:
       endpoint_server_pcm_server_pcm_005:
       - server_pcm_005
       - endpoint_server_pcm
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
       cpu_server_pcm_server_pcm_005:
       - server_pcm_005
       - cpu_server_pcm
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
+      binding_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - binding_pcm_port_01
+      disk.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.iops
+      feature_network_2_server_pcm_005:
+      - server_pcm_005
+      - feature_network_2
       disk.device.read.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.read.bytes_server_pcm
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
+      disk.device.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes.rate
+      attachment_network_1:
+      - network_1
+      - attachment
+      attachment_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - attachment_pcm_port_00
+      end_point_network_2_server_pcm_005:
+      - server_pcm_005
+      - end_point_network_2
       feature_server_pcm_005:
       - server_pcm_005
       - feature
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
+      disk.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests
+      disk.read.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.read.bytes
+      cpu_util_server_pcm_1:
+      - server_pcm_1
+      - cpu_util
+      disk.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.allocation
+      disk.device.write.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.device.write.bytes
-      network.outgoing.packets.rate_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.outgoing.packets.rate_pcm_port_0
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      link_network:
-      - network
-      - link
-      disk.capacity_server_pcm:
-      - server_pcm
-      - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
+      memory.usage_server_pcm_1:
+      - server_pcm_1
+      - memory.usage
       memory.usage_server_pcm_server_pcm_005:
       - server_pcm_005
       - memory.usage_server_pcm
-      network.incoming.packets.rate_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.packets.rate_pcm_port_0
-      endpoint_server_pcm:
-      - server_pcm
-      - endpoint
-      end_point_network:
-      - network
-      - end_point
+      disk.device.read.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes
       disk.device.write.requests_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.write.requests_server_pcm
+      disk.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.read.bytes.rate
+      disk.device.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.device.iops
       disk.device.iops_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.iops_server_pcm
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
       disk.device.capacity_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.capacity_server_pcm
-      network.incoming.bytes_pcm_port_1_server_pcm_005:
+      cpu.delta_server_pcm_1:
+      - server_pcm_1
+      - cpu.delta
+      network.outpoing.packets_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.outpoing.packets_pcm_port_01
+      network.incoming.bytes.rate_pcm_port_00_server_pcm_005:
       - server_pcm_005
-      - network.incoming.bytes_pcm_port_1
-      network.incoming.bytes.rate_pcm_port_0_server_pcm_005:
+      - network.incoming.bytes.rate_pcm_port_00
+      disk.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests.rate
+      feature_pcm_port_00_server_pcm_005:
       - server_pcm_005
-      - network.incoming.bytes.rate_pcm_port_0
+      - feature_pcm_port_00
+      disk.ephemeral.size_server_pcm_1:
+      - server_pcm_1
+      - disk.ephemeral.size
       feature_server_pcm_server_pcm_005:
       - server_pcm_005
       - feature_server_pcm
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
       disk.device.write.requests.rate_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.write.requests.rate_server_pcm
-      binding_pcm_port_0_server_pcm_005:
+      scalable_server_pcm_1:
+      - server_pcm_1
+      - scalable
+      network.outgoing.bytes.rate_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - binding_pcm_port_0
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
+      - network.outgoing.bytes.rate_pcm_port_01
+      network.outgoing.packets.rate_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - network.outgoing.packets.rate_pcm_port_00
       disk.device.allocation_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.device.allocation_server_pcm
-      network.incoming.packets_pcm_port_1_server_pcm_005:
-      - server_pcm_005
-      - network.incoming.packets_pcm_port_1
-      attachment_network_server_pcm_005:
-      - server_pcm_005
-      - attachment_network
+      disk.device.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.device.latency
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
       network.incoming.packets_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets
+      disk.device.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.device.usage
       network.outgoing.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes.rate
-      end_point_network_server_pcm_005:
-      - server_pcm_005
-      - end_point_network
+      disk.device.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests
       network.incoming.packets_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets
       disk.root.size_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.root.size_server_pcm
-      instance_server_pcm:
-      - server_pcm
-      - instance
+      network.incoming.bytes_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.bytes_pcm_port_01
+      network.incoming.packets_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - network.incoming.packets_pcm_port_01
+      disk.device.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests
+      os_server_pcm_1:
+      - server_pcm_1
+      - os
       cpu.delta_server_pcm_server_pcm_005:
       - server_pcm_005
       - cpu.delta_server_pcm
@@ -621,45 +621,45 @@ topology_template:
       dependency_server_pcm_005:
       - server_pcm_005
       - dependency
-      link_pcm_port_1_server_pcm_005:
+      dependency_network_2_server_pcm_005:
       - server_pcm_005
-      - link_pcm_port_1
-      dependency_pcm_port_1_server_pcm_005:
+      - dependency_network_2
+      dependency_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - dependency_pcm_port_1
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
-      dependency_pcm_port_0_server_pcm_005:
-      - server_pcm_005
-      - dependency_pcm_port_0
+      - dependency_pcm_port_01
       dependency_pcm_port_0:
       - pcm_port_0
       - dependency
-      dependency_server_pcm:
-      - server_pcm
-      - dependency
       local_storage_server_pcm_server_pcm_005:
       - server_pcm_005
       - local_storage_server_pcm
       dependency_pcm_port_1:
       - pcm_port_1
       - dependency
+      link_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - link_pcm_port_00
       dependency_server_pcm_server_pcm_005:
       - server_pcm_005
       - dependency_server_pcm
+      local_storage_server_pcm_1:
+      - server_pcm_1
+      - local_storage
       link_pcm_port_0:
       - pcm_port_0
       - link
       link_pcm_port_1:
       - pcm_port_1
       - link
-      dependency_network:
-      - network
-      - dependency
-      link_pcm_port_0_server_pcm_005:
+      dependency_pcm_port_00_server_pcm_005:
       - server_pcm_005
-      - link_pcm_port_0
-      dependency_network_server_pcm_005:
+      - dependency_pcm_port_00
+      dependency_server_pcm_1:
+      - server_pcm_1
+      - dependency
+      dependency_network_1:
+      - network_1
+      - dependency
+      link_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - dependency_network
\ No newline at end of file
+      - link_pcm_port_01
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
index 16b003a..806d12e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
@@ -76,7 +76,7 @@ topology_template:
       type: string
       description: OAM network name
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -89,13 +89,13 @@ topology_template:
         - get_input: security_group_name
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: oam
+        network_role_tag: cps
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -114,7 +114,12 @@ topology_template:
         user_data_format: RAW
         name:
           get_input: pcm_server_name
-    pcm_port_0:
+    network_2:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        network_name:
+          get_input: cps_net_name
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -127,23 +132,18 @@ topology_template:
         - get_input: security_group_name
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: cps
+        network_role_tag: oam
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_pcm
           relationship: tosca.relationships.network.BindsTo
-    network:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        network_name:
-          get_input: cps_net_name
   groups:
     nested-pcm_v0.1_2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -151,10 +151,10 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1_2.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
-      - network
+      - network_2
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -162,48 +162,72 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
       memory.resident_server_pcm:
       - server_pcm
       - memory.resident
+      attachment_network_2:
+      - network_2
+      - attachment
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      feature_network_2:
+      - network_2
+      - feature
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -213,27 +237,18 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
-      link_network:
-      - network
-      - link
       disk.capacity_server_pcm:
       - server_pcm
       - disk.capacity
@@ -243,48 +258,27 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
+      link_network_2:
+      - network_2
+      - link
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
-      end_point_network:
-      - network
-      - end_point
       vcpus_server_pcm:
       - server_pcm
       - vcpus
-      attachment_network:
-      - network
-      - attachment
       disk.write.bytes_server_pcm:
       - server_pcm
       - disk.write.bytes
@@ -300,45 +294,48 @@ topology_template:
       scalable_server_pcm:
       - server_pcm
       - scalable
-      feature_network:
-      - network
-      - feature
       disk.device.read.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.read.bytes.rate
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -354,34 +351,37 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      end_point_network_2:
+      - network_2
+      - end_point
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
-      dependency_network:
-      - network
+      dependency_pcm_port_00:
+      - pcm_port_00
       - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
+      dependency_network_2:
+      - network_2
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml
index 66a0379..61c1944 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml
@@ -78,21 +78,21 @@ resources:
     type: OS::Heat::MultipartMime
     properties:
       parts:
-      - config: { get_resource: network}
+      - config: { get_resource: network_1}
       - config: { get_resource: script_init}
 
   script_init:
     type: OS::Heat::MultipartMime
     properties:
       parts:
-      - config: { get_resource: network}
+      - config: { get_resource: network_1}
 
-  network:
+  network_1:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: cps_net_name}
 
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -126,13 +126,7 @@ resources:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  #pcm_vol_attachment:
-  #  type: OS::Cinder::VolumeAttachment
-  #  properties:
-  #    volume_id: { get_param: pcm_vol }
-  #    mountpoint: /dev/vdb
-  #    instance_uuid: { get_resource: server_pcm }
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml
index 11be0dd..5f44c88 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml
@@ -50,16 +50,16 @@ resources:
     type: OS::Heat::MultipartMime
     properties:
       parts:
-      - config: { get_resource: network}
+      - config: { get_resource: network_2}
       - config: { get_resource: script_init}
 
   script_init:
     type: OS::Heat::MultipartMime
     properties:
       parts:
-      - config: { get_resource: network}
+      - config: { get_resource: network_2}
 
-  network:
+  network_2:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: cps_net_name}
@@ -73,8 +73,8 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
@@ -82,7 +82,7 @@ resources:
       user_data:
         get_resource: server_init
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -90,7 +90,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 960202a..8d6c862 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -64,6 +64,20 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
+    - dependency_server_cmaui_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -90,27 +104,27 @@ node_types:
         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
@@ -164,14 +178,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
@@ -191,14 +205,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
@@ -231,45 +245,26 @@ 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:
+      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:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      network.incoming.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:
         - 1
         - UNBOUNDED
-      disk.device.allocation_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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -281,28 +276,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_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
-      disk.device.usage_server_cmaui_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_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.
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -313,22 +306,12 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
-        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.
@@ -341,9 +324,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_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_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -353,42 +335,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_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_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:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      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:
@@ -407,13 +382,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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
       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:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -426,93 +407,97 @@ 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:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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
-      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
+      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
-      instance_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.ephemeral.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_1:
+      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_2:
+      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:
@@ -531,59 +516,56 @@ 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:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
+      feature_test_nested2Level:
         type: tosca.capabilities.Node
         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
+      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
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      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
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      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
@@ -593,13 +575,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -617,31 +599,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_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
-      disk.device.iops_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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:
@@ -654,13 +636,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.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.
-        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:
@@ -677,13 +653,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      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.requests.rate_server_cmaui_test_nested2Level:
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
@@ -694,73 +675,71 @@ node_types:
         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.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_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.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_2:
+      network.outgoing.bytes.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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
+      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
-      disk.usage_server_cmaui:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.incoming.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
-      disk.capacity_server_cmaui:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      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:
@@ -778,15 +757,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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
-      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_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -796,194 +768,164 @@ 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
-      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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_template_VMInt_OAM_lb_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_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
-      disk.device.read.requests.rate_server_cmaui:
+      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
-      vcpus_server_cmaui_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:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outpoing.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:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_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.outgoing.bytes.rate_template_VMInt_OAM_lb_4_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
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.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:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.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
-      memory.usage_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
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vcpus_server_cmaui:
+      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.device.write.bytes_server_cmaui:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_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
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      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
-      memory_server_cmaui_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      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
-      disk.device.write.requests_server_cmaui_test_nested4Level_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
-      disk.ephemeral.size_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.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -995,24 +937,13 @@ node_types:
         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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1024,264 +955,256 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_7_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.write.requests_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 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.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      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.outpoing.packets_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
-      disk.device.write.requests_server_cmaui:
+      network.outpoing.packets_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.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_8_test_nested4Level_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
-      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:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.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.outgoing.packets.rate_template_VMInt_OAM_lb_1:
+      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.root.size_server_cmaui:
+      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.latency_server_cmaui_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
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_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
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level_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.requests.rate_server_cmaui_test_nested2Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.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:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_1:
+      network.outpoing.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.outpoing.packets_template_VMInt_OAM_lb_2:
+      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.read.bytes_server_cmaui_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
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_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
-      cpu_util_server_cmaui_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_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.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1293,13 +1216,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_5_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
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      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:
@@ -1316,7 +1239,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1328,45 +1251,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.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.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vcpus_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
-      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:
+      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
-      memory.usage_server_cmaui_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      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.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
@@ -1387,9 +1291,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
@@ -1399,30 +1302,36 @@ 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
+      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
-      memory_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:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1433,49 +1342,55 @@ 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.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.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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:
+        - 1
+        - UNBOUNDED
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1486,30 +1401,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.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:
@@ -1521,117 +1442,158 @@ 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
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      memory.resident_server_cmaui_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
-      host_server_cmaui_test_nested4Level_test_nested3Level_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_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_4_test_nested2Level:
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      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
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.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
-      network.outgoing.bytes_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.outgoing.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
-      disk.read.bytes.rate_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
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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
-      disk.allocation_server_cmaui_test_nested2Level:
+      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_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
@@ -1651,13 +1613,25 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu.delta_server_cmaui_test_nested2Level:
+      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:
@@ -1668,14 +1642,27 @@ 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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1691,19 +1678,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       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.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1768,6 +1768,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
@@ -1821,14 +1835,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
@@ -1848,14 +1862,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
@@ -1888,20 +1902,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
@@ -1909,31 +1909,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:
@@ -1944,24 +1932,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:
@@ -1973,49 +1950,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:
@@ -2028,6 +1993,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:
@@ -2035,13 +2006,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:
@@ -2053,19 +2029,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:
@@ -2076,30 +2052,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:
@@ -2110,53 +2106,68 @@ 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
+      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
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2174,49 +2185,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.outpoing.packets_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.outpoing.packets_template_VMInt_OAM_lb_4:
+      network.outgoing.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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_7_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
-      disk.write.requests.rate_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
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_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
-      network.incoming.packets_template_VMInt_OAM_lb_3:
+      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
-      cpu_util_server_cmaui_test_nested3Level:
+      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:
@@ -2241,202 +2252,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:
@@ -2447,25 +2459,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:
@@ -2484,147 +2495,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
@@ -2639,12 +2640,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:
@@ -2657,27 +2652,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
@@ -2687,78 +2680,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
@@ -2767,49 +2756,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:
@@ -2828,13 +2817,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:
@@ -2846,154 +2840,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:
@@ -3107,14 +3107,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
@@ -3134,14 +3134,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
@@ -3149,48 +3149,25 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.capabilities.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:
+      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
-      memory_server_cmaui_test_nested4Level:
+      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
-      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:
+      disk.device.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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:
@@ -3202,32 +3179,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:
@@ -3247,13 +3217,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:
@@ -3271,46 +3241,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
@@ -3320,333 +3300,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:
@@ -3657,6 +3648,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.
@@ -3674,100 +3671,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
+      endpoint_server_cmaui_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      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:
@@ -3795,88 +3799,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
@@ -3962,14 +3962,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
@@ -3977,87 +3977,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:
+      disk.device.write.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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
-      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
@@ -4068,12 +4053,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:
@@ -4081,13 +4060,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:
@@ -4099,13 +4078,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.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.write.requests.rate_server_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4122,6 +4107,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.
@@ -4133,64 +4124,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.
@@ -4209,7 +4207,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:
@@ -4233,107 +4231,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/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 6dd6f77..7936734 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -68,6 +68,20 @@ topology_template:
       immutable: false
       type: string
   node_templates:
+    server_cmaui_1:
+      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
     template_VMInt_OAM_lb_1:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
@@ -83,7 +97,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
     template_VMInt_OAM_lb_2:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
@@ -101,22 +115,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           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
     test_nested2Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested2
       directives:
@@ -135,136 +135,130 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: nested1
       members:
+      - server_cmaui_1
       - template_VMInt_OAM_lb_1
       - template_VMInt_OAM_lb_2
-      - server_cmaui
       - test_nested2Level
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.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
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
       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:
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.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.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
+      - scalable_server_cmaui_3_test_nested3Level
       binding_template_VMInt_OAM_lb_5_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:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.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:
+      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
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.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.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
+      - disk.capacity_server_cmaui_2
       binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_template_VMInt_OAM_lb_6_test_nested3Level
       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
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
       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
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       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
+      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.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.packets
@@ -277,441 +271,399 @@ topology_template:
       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
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
+      - instance_server_cmaui_3_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_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
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.incoming.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
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
       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:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      - 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.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.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
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      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
       network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_template_VMInt_OAM_lb_4
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_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
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       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
-      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
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.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:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
-      disk.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
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       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:
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
+      os_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - 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.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:
-      - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_2
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
+      - memory_server_cmaui_3_test_nested3Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      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:
-      - 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_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       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
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
+      memory.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - 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:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_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
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_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
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       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.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.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.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
+      - disk.write.bytes.rate_server_cmaui_2
       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
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      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
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
-      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:
+      - 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.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.allocation_server_cmaui_2
       network.outpoing.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - 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:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_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
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.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
       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
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
       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:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_2
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.iops_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
-      - disk.iops_server_cmaui
-      memory.usage_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      - 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
@@ -721,168 +673,216 @@ 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:
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
       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
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
+      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.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       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
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
+      - disk.root.size_server_cmaui_2
       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.capacity_server_cmaui_test_nested4Level_test_nested3Level
+      - 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.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
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       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
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - 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
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       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.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - 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
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
       network.outgoing.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level
       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:
-      - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
       dependency_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
@@ -890,9 +890,9 @@ topology_template:
       dependency_template_VMInt_OAM_lb_4_test_nested2Level:
       - test_nested2Level
       - dependency_template_VMInt_OAM_lb_4
-      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
@@ -911,21 +911,30 @@ 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_2:
       - template_VMInt_OAM_lb_2
       - link
-      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
+      - local_storage_server_cmaui_3_test_nested3Level
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       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
@@ -938,18 +947,9 @@ topology_template:
       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_server_cmaui_1:
+      - server_cmaui_1
       - 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
       dependency_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested4Level_test_nested3Level
@@ -962,6 +962,6 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
\ No newline at end of file
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index add8fa9..37ec759 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -68,6 +68,20 @@ topology_template:
       immutable: false
       type: string
   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/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 9be4e5d..a394a1b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/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/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index e1f9672..603537c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested1.yml
index 518849a..8e7304c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested1.yml
@@ -57,7 +57,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested2.yml
index 634c34b..8220fad 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested2.yml
@@ -57,7 +57,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested3.yml
index 2b33ff1..c372890 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested3.yml
@@ -58,7 +58,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested4.yml
index d1c7d1d..a59d759 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/inputfiles/nested4.yml
@@ -56,7 +56,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 2a6a954..1d966f2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -82,6 +82,20 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
+    - dependency_server_cmaui_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_template_VMInt_OAM_lb_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -121,20 +135,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
     - dependency_server_abc:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -163,25 +163,13 @@ node_types:
         - 1
         - 1
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.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_abc:
         type: org.openecomp.capabilities.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_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:
@@ -193,23 +181,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      os_server_abc:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      cpu_server_abc:
         type: org.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_abc:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_abc:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -227,14 +210,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -260,13 +242,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      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
-      network.incoming.bytes_template_VMInt_OAM_lb_3:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -289,60 +271,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_abc:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_template_VMInt_OAM_lb_2:
+      disk.write.requests_server_abc:
         type: org.openecomp.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.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.capacity_server_abc:
+      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
-      disk.device.write.bytes_server_abc:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.capacity_server_abc:
+        type: org.openecomp.capabilities.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -383,12 +372,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_abc:
         type: org.openecomp.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_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.
@@ -442,18 +443,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
+      network.incoming.bytes.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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_1:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -477,13 +479,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_abc_port_1:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.incoming.packets.rate_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -495,31 +497,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.allocation_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_abc:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -531,19 +533,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -555,19 +556,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.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.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         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.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.bytes.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:
@@ -579,49 +578,31 @@ node_types:
         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.
-        occurrences:
-        - 1
-        - 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
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.root.size_server_abc:
         type: org.openecomp.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_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_3:
+      disk.device.latency_server_abc:
         type: org.openecomp.capabilities.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_abc:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -639,9 +620,8 @@ 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_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -661,14 +641,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_template_VMInt_OAM_lb_1:
-        type: tosca.capabilities.Node
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         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.
+      feature_template_VMInt_OAM_lb_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -678,11 +657,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -695,7 +669,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -712,7 +686,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -724,6 +698,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -789,7 +770,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -801,19 +782,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vcpus_server_cmaui:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -833,13 +808,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -864,8 +833,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -881,6 +869,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_abc:
         type: tosca.capabilities.Node
         occurrences:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index c36c942..c36dce1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -88,6 +88,20 @@ topology_template:
       type: string
       description: Image for CMAUI server
   node_templates:
+    server_cmaui_1:
+      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
     template_VMInt_OAM_lb_1:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
@@ -103,7 +117,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
     template_VMInt_OAM_lb_2:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
@@ -120,7 +134,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
     template_VMInt_OAM_lb_3:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
@@ -138,22 +152,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           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
     server_abc:
       type: org.openecomp.resource.vfc.nodes.heat.abc
       properties:
@@ -201,54 +201,45 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: cmaui server template for vMMSC
       members:
+      - server_cmaui_1
       - template_VMInt_OAM_lb_1
       - template_VMInt_OAM_lb_2
       - template_VMInt_OAM_lb_3
-      - server_cmaui
       - server_abc
       - abc_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
       disk.write.bytes.rate_server_abc:
       - server_abc
       - disk.write.bytes.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
       memory.resident_server_abc:
       - server_abc
       - memory.resident
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
       os_server_abc:
       - server_abc
       - os
       cpu_server_abc:
       - server_abc
       - cpu
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
       network.outgoing.packets.rate_abc_port_1:
       - abc_port_1
       - network.outgoing.packets.rate
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
       binding_abc_port_1:
       - abc_port_1
       - binding
@@ -258,12 +249,12 @@ topology_template:
       binding_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - binding
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
       network.incoming.bytes_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.bytes
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.incoming.bytes_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.bytes
@@ -273,14 +264,20 @@ topology_template:
       feature_abc_port_1:
       - abc_port_1
       - feature
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
       disk.write.requests_server_abc:
       - server_abc
       - disk.write.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
       - disk.device.read.bytes
       network.outgoing.packets.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
@@ -288,21 +285,18 @@ topology_template:
       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.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       disk.capacity_server_abc:
       - server_abc
       - disk.capacity
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
       disk.device.write.bytes_server_abc:
       - server_abc
       - disk.device.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
       network.outpoing.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outpoing.packets
@@ -321,9 +315,15 @@ topology_template:
       attachment_abc_port_1:
       - abc_port_1
       - attachment
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
       disk.read.bytes_server_abc:
       - server_abc
       - disk.read.bytes
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
       network.incoming.packets_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.packets
@@ -351,15 +351,15 @@ topology_template:
       disk.write.requests.rate_server_abc:
       - server_abc
       - disk.write.requests.rate
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.outgoing.bytes.rate
       network.incoming.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.incoming.bytes.rate
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
       network.incoming.bytes.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.incoming.bytes.rate
@@ -369,90 +369,81 @@ topology_template:
       instance_server_abc:
       - server_abc
       - instance
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
       network.incoming.packets.rate_abc_port_1:
       - abc_port_1
       - network.incoming.packets.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
       disk.device.write.bytes.rate_server_abc:
       - server_abc
       - disk.device.write.bytes.rate
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      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
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       disk.allocation_server_abc:
       - server_abc
       - disk.allocation
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
       disk.device.iops_server_abc:
       - server_abc
       - disk.device.iops
-      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
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
       network.incoming.packets_abc_port_1:
       - abc_port_1
       - network.incoming.packets
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - network.outgoing.bytes.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
       network.outgoing.bytes.rate_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - network.outgoing.bytes.rate
-      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.root.size_server_abc:
       - server_abc
       - disk.root.size
-      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_1:
+      - server_cmaui_1
+      - disk.write.requests
       network.incoming.packets.rate_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - network.incoming.packets.rate
       disk.device.latency_server_abc:
       - server_abc
       - disk.device.latency
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       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.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       feature_template_VMInt_OAM_lb_2:
       - template_VMInt_OAM_lb_2
       - feature
@@ -462,39 +453,39 @@ topology_template:
       memory_server_abc:
       - server_abc
       - memory
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
       feature_template_VMInt_OAM_lb_1:
       - template_VMInt_OAM_lb_1
       - feature
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
       disk.device.read.bytes_server_abc:
       - server_abc
       - disk.device.read.bytes
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
       memory.usage_server_abc:
       - server_abc
       - memory.usage
       disk.read.requests_server_abc:
       - server_abc
       - disk.read.requests
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       disk.usage_server_abc:
       - server_abc
       - disk.usage
       scalable_server_abc:
       - server_abc
       - scalable
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
       disk.write.bytes_server_abc:
       - server_abc
       - disk.write.bytes
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       disk.read.bytes.rate_server_abc:
       - server_abc
       - disk.read.bytes.rate
@@ -528,33 +519,27 @@ topology_template:
       network.incoming.bytes_abc_port_1:
       - abc_port_1
       - network.incoming.bytes
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
       disk.device.allocation_server_abc:
       - server_abc
       - disk.device.allocation
-      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_1:
+      - server_cmaui_1
+      - instance
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       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.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
       disk.device.write.requests.rate_server_abc:
       - server_abc
       - disk.device.write.requests.rate
@@ -564,15 +549,30 @@ topology_template:
       host_server_abc:
       - server_abc
       - host
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
       cpu.delta_server_abc:
       - server_abc
       - cpu.delta
       disk.latency_server_abc:
       - server_abc
       - disk.latency
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
       feature_server_abc:
       - server_abc
       - feature
@@ -589,12 +589,6 @@ topology_template:
       dependency_server_abc:
       - server_abc
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
       link_template_VMInt_OAM_lb_3:
       - template_VMInt_OAM_lb_3
       - link
@@ -613,6 +607,12 @@ topology_template:
       link_abc_port_1:
       - abc_port_1
       - link
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
       local_storage_server_abc:
       - server_abc
       - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/inputfiles/nested1.yml
index ab65fc9..6f3c300 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/inputfiles/nested1.yml
@@ -87,7 +87,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 e12c896..5be719e 100644 (file)
--- 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:
-        type: org.openecomp.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:
+      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
-      vcpus_server_cmaui_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_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.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:
-        type: org.openecomp.capabilities.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.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      vcpus_server_cmaui_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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,361 +2131,391 @@ 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
-        occurrences:
-        - 1
-        - UNBOUNDED
       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
-      memory.usage_server_cmaui_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
-      feature_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      disk.read.bytes_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      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.
+      feature_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      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.device.write.bytes.rate_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
-      disk.device.latency_server_cmaui_test_nested4Level_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.outpoing.packets_template_VMInt_OAM_lb_3:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      cpu_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_template_VMInt_OAM_lb_4:
+      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.outgoing.bytes.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_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
-      vcpus_server_cmaui_test_nested4Level_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:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_template_VMInt_OAM_lb_3:
+      network.outpoing.packets_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.incoming.packets_template_VMInt_OAM_lb_3:
+      network.outgoing.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
-      cpu_util_server_cmaui_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
-      network.outgoing.bytes_template_VMInt_OAM_lb_4:
+      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.incoming.packets_template_VMInt_OAM_lb_4:
+      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
-      binding_template_VMInt_OAM_lb_5_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      disk.allocation_server_cmaui_test_nested3Level:
+      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:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level:
+      network.outgoing.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.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_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
-      cpu.delta_server_cmaui_test_nested3Level:
+      binding_template_VMInt_OAM_lb_5_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.device.read.bytes_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
-      disk.device.read.requests_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
-      network.outgoing.bytes_template_VMInt_OAM_lb_8_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
-      disk.write.requests_server_cmaui_test_nested4Level_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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_3:
+      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
-      disk.device.read.bytes.rate_server_cmaui_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
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_4:
+      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
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      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
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_3:
+      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
-      disk.device.write.requests_server_cmaui_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      network.incoming.bytes.rate_template_VMInt_OAM_lb_4:
+      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
-      memory.usage_server_cmaui:
+      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
-      network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested4Level_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
-      disk.ephemeral.size_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      network.incoming.packets.rate_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_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_6_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
-      network.outpoing.packets_template_VMInt_OAM_lb_5_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
-      disk.iops_server_cmaui:
+      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
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.read.bytes_server_cmaui:
+      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.root.size_server_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level:
+      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
+      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
-      cpu_server_cmaui_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:
@@ -2521,30 +2527,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_template_VMInt_OAM_lb_5_test_nested3Level:
         type: tosca.capabilities.Node
         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:
-        type: org.openecomp.capabilities.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:
+      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
-      memory_server_cmaui_test_nested4Level:
+      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
-      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:
+      disk.device.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.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.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 0a27596..26236a1 100644 (file)
--- 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 4e6471a..255b99a 100644 (file)
--- 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 67666e3..3280a0e 100644 (file)
--- 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 fbaabc1..4189c1e 100644 (file)
--- 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

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested1.yml
index 6fdead1..6066627 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested1.yml
@@ -57,7 +57,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  template_VMInt_OAM_lb_3:
+  template_VMInt_OAM_lb_30:
     type: OS::ContrailV2::VirtualMachineInterface
     properties:
       virtual_machine_interface_properties:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested2.yml
index c5a9f47..f9ba29d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested2.yml
@@ -57,7 +57,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested3.yml
index fd9f62f..7436dbd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested3.yml
@@ -58,7 +58,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested4.yml
index fdcbdf0..5275ac4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/inputfiles/nested4.yml
@@ -56,7 +56,7 @@ resources:
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4b348b7..ec0f41e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -153,6 +153,13 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
+    - dependency_hsl_direct_net_3:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_service_instance4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -181,21 +188,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net:
+    - dependency_service_policy_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_service_policy:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - network_service_policy:
+    - network_service_policy_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
@@ -203,13 +203,13 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      link_hsl_direct_net:
-        type: tosca.capabilities.network.Linkable
+      end_point_hsl_direct_net_3:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy:
-        type: tosca.capabilities.Node
+      link_hsl_direct_net_3:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -218,18 +218,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net:
-        type: tosca.capabilities.Attachment
+      feature_hsl_direct_net_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
+      feature_service_policy_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      attachment_hsl_direct_net_3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -381,35 +381,21 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_service_instance1:
+    - dependency_hsl_direct_net_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_port_0_service_instance1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_1_service_instance1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_2_service_instance1:
-        capability: tosca.capabilities.network.Linkable
+    - dependency_test_nested3:
+        capability: tosca.capabilities.Node
         node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3:
+        - 0
+        - UNBOUNDED
+    - dependency_hsl_direct_net_3_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -444,34 +430,20 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net_test_nested3:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_service_policy_test_nested3:
+    - dependency_service_policy_3_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested3:
+    - network_service_policy_3_test_nested3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_hsl_direct_net:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_service_instance3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -500,27 +472,50 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_service_policy:
+    - dependency_service_policy_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy:
+    - network_service_policy_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    capabilities:
-      feature_service_policy_test_nested3:
-        type: tosca.capabilities.Node
+    - dependency_service_instance21:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_service_instance1:
+    - link_port_0_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      feature_service_instance21:
         type: tosca.capabilities.Node
         occurrences:
         - 1
@@ -530,43 +525,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net:
-        type: tosca.capabilities.Attachment
+      feature_hsl_direct_net_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      feature_service_policy_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance4_test_nested3:
+      feature_service_policy_3_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net:
-        type: tosca.capabilities.network.Linkable
+      end_point_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy:
+      feature_service_instance4_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net_test_nested3:
+      feature_hsl_direct_net_3_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested3:
+      link_hsl_direct_net_2:
         type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested3:
-        type: tosca.capabilities.Attachment
+      link_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -575,13 +570,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
-        type: tosca.capabilities.Node
+      end_point_hsl_direct_net_2:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested3:
-        type: tosca.capabilities.Endpoint
+      attachment_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_hsl_direct_net_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -796,35 +796,21 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_service_instance1_test_nested2:
+    - dependency_hsl_direct_net_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_port_0_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_1_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_2_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
+    - dependency_test_nested3_test_nested2:
+        capability: tosca.capabilities.Node
         node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3_test_nested2:
+        - 0
+        - UNBOUNDED
+    - dependency_hsl_direct_net_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -859,34 +845,20 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net_test_nested3_test_nested2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_service_policy_test_nested3_test_nested2:
+    - dependency_service_policy_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested3_test_nested2:
+    - network_service_policy_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_hsl_direct_net_test_nested2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_service_instance3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -915,20 +887,48 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_service_policy_test_nested2:
+    - dependency_service_policy_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested2:
+    - network_service_policy_2_test_nested2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_service_instance21_test_nested2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_port_0_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_hsl_direct_net:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -951,18 +951,13 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      feature_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_service_instance1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy_test_nested2:
-        type: tosca.capabilities.Node
+      attachment_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -976,6 +971,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      end_point_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_hsl_direct_net:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -986,23 +986,28 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance3_test_nested2:
-        type: tosca.capabilities.Node
+      end_point_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net_test_nested2:
+      feature_service_instance3_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested3_test_nested2:
+      end_point_hsl_direct_net:
         type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      feature_service_policy_2_test_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      link_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -1016,51 +1021,94 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.network.Linkable
+      feature_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      link_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.Attachment
+      feature_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance1_test_nested2:
+      feature_hsl_direct_net:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Linkable
+      feature_service_policy_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2:
+      feature_hsl_direct_net_3_test_nested3_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
+      feature_service_instance21_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      attachment_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.Endpoint
+  org.openecomp.resource.abstract.nodes.heat.service_template_3:
+    derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
+    requirements:
+    - link_port_0:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
-        - UNBOUNDED
+        - 1
+    - link_port_1:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+  org.openecomp.resource.abstract.nodes.heat.service_template_2:
+    derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
+    requirements:
+    - link_port_0:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
   org.openecomp.resource.abstract.nodes.heat.service_template:
     derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
     requirements:
@@ -1086,4 +1134,4 @@ node_types:
         - 1
         - 1
   org.openecomp.resource.vfc.nodes.heat.st:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
\ No newline at end of file
+    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
index 099462a..8e8e4f9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -85,18 +85,6 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: Internal2-net
           relationship: tosca.relationships.network.LinksTo
-      - link_port_0_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_1_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_2_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
       - link_port_0_service_instance4_test_nested3_test_nested2:
           capability: tosca.capabilities.network.Linkable
           node: Internal1-net
@@ -121,6 +109,18 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: Internal2-net
           relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
   groups:
     main_group:
       type: org.openecomp.groups.heat.HeatStack

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
index 4394a39..d456191 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
@@ -153,8 +153,30 @@ topology_template:
       type: string
       description: HSL (Logging) network address (CIDR notation)
   node_templates:
-    service_instance1:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+    hsl_direct_net_2:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        network_name:
+          get_input: HSL_direct_net_id
+        subnets:
+          hsl_ip_subnet_2:
+            cidr:
+              get_input: HSL_direct_net_cidr
+            gateway_ip:
+              get_input: HSL_direct_net_gateway
+    test_nested3:
+      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
+      directives:
+      - substitutable
+      properties:
+        network_param2:
+          get_input: network_param1
+        service_template_filter:
+          substitute_service_template: OCS-fw3ServiceTemplate.yaml
+        network_param1:
+          get_input: network_param1
+    service_instance3:
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_2
       directives:
       - substitutable
       properties:
@@ -165,7 +187,7 @@ topology_template:
         image_name:
           get_input: st_image_name
         service_template_filter:
-          substitute_service_template: OCS-fw2_service_instance1ServiceTemplate.yaml
+          substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml
           count:
             get_input: max_num_fw_instances
           scaling_enabled:
@@ -205,7 +227,7 @@ topology_template:
           get_input: service_instance_name
         interface_list:
         - virtual_network:
-            get_input: network_param2
+            get_input: network_param1
         - virtual_network:
             get_input: network_param1
         - virtual_network:
@@ -228,32 +250,44 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
+          node: hsl_direct_net_2
           relationship: tosca.relationships.DependsOn
-    test_nested3:
-      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
-      directives:
-      - substitutable
-      properties:
-        network_param2:
-          get_input: network_param1
-        service_template_filter:
-          substitute_service_template: OCS-fw3ServiceTemplate.yaml
-        network_param1:
-          get_input: network_param1
-    hsl_direct_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+    service_policy_2:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
       properties:
-        network_name:
-          get_input: HSL_direct_net_id
-        subnets:
-          hsl_ip_subnet:
-            cidr:
-              get_input: HSL_direct_net_cidr
-            gateway_ip:
-              get_input: HSL_direct_net_gateway
-    service_instance3:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+        entries:
+          policy_rule:
+          - src_ports:
+            - start_port:
+                get_input: start_src_ports
+              end_port:
+                get_input: end_src_ports
+            protocol: any
+            action_list:
+              apply_service:
+              - service_instance3
+            dst_addresses:
+            - virtual_network:
+                get_input: Cricket_OCS_direct_net_id
+            dst_ports:
+            - start_port:
+                get_input: start_dst_ports
+              end_port:
+                get_input: end_dst_ports
+            src_addresses:
+            - virtual_network:
+                get_input: Cricket_OCS_protected_net_id
+            direction:
+              get_input: service_policy_direction
+        name:
+          get_input: service_policy_name
+      requirements:
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: service_instance3
+          relationship: tosca.relationships.DependsOn
+    service_instance21:
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_2
       directives:
       - substitutable
       properties:
@@ -264,7 +298,7 @@ topology_template:
         image_name:
           get_input: st_image_name
         service_template_filter:
-          substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml
+          substitute_service_template: OCS-fw2_service_instance21ServiceTemplate.yaml
           count:
             get_input: max_num_fw_instances
           scaling_enabled:
@@ -304,7 +338,7 @@ topology_template:
           get_input: service_instance_name
         interface_list:
         - virtual_network:
-            get_input: network_param1
+            get_input: network_param2
         - virtual_network:
             get_input: network_param1
         - virtual_network:
@@ -327,41 +361,7 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
-          relationship: tosca.relationships.DependsOn
-    service_policy:
-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
-      properties:
-        entries:
-          policy_rule:
-          - src_ports:
-            - start_port:
-                get_input: start_src_ports
-              end_port:
-                get_input: end_src_ports
-            protocol: any
-            action_list:
-              apply_service:
-              - service_instance3
-            dst_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_direct_net_id
-            dst_ports:
-            - start_port:
-                get_input: start_dst_ports
-              end_port:
-                get_input: end_dst_ports
-            src_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_protected_net_id
-            direction:
-              get_input: service_policy_direction
-        name:
-          get_input: service_policy_name
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: service_instance3
+          node: hsl_direct_net_2
           relationship: tosca.relationships.DependsOn
   groups:
     OCS-fw2_group:
@@ -371,111 +371,111 @@ topology_template:
         description: |
           Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
       members:
-      - service_instance1
+      - hsl_direct_net_2
       - test_nested3
-      - hsl_direct_net
       - service_instance3
-      - service_policy
+      - service_policy_2
+      - service_instance21
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw2
     capabilities:
-      feature_service_policy_test_nested3:
-      - test_nested3
-      - feature_service_policy
-      feature_service_instance1:
-      - service_instance1
+      feature_service_instance21:
+      - service_instance21
       - feature
       feature_service_instance3:
       - service_instance3
       - feature
-      attachment_hsl_direct_net:
-      - hsl_direct_net
-      - attachment
-      end_point_hsl_direct_net:
-      - hsl_direct_net
-      - end_point
+      feature_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - feature
+      feature_service_policy_2:
+      - service_policy_2
+      - feature
+      feature_service_policy_3_test_nested3:
+      - test_nested3
+      - feature_service_policy_3
+      end_point_hsl_direct_net_3_test_nested3:
+      - test_nested3
+      - end_point_hsl_direct_net_3
       feature_service_instance4_test_nested3:
       - test_nested3
       - feature_service_instance4
-      link_hsl_direct_net:
-      - hsl_direct_net
-      - link
-      feature_service_policy:
-      - service_policy
-      - feature
-      feature_hsl_direct_net_test_nested3:
-      - test_nested3
-      - feature_hsl_direct_net
-      link_hsl_direct_net_test_nested3:
+      feature_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - link_hsl_direct_net
-      attachment_hsl_direct_net_test_nested3:
+      - feature_hsl_direct_net_3
+      link_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - link
+      link_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - attachment_hsl_direct_net
+      - link_hsl_direct_net_3
       feature_test_nested3:
       - test_nested3
       - feature
-      feature_hsl_direct_net:
-      - hsl_direct_net
-      - feature
-      end_point_hsl_direct_net_test_nested3:
+      end_point_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - end_point
+      attachment_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - end_point_hsl_direct_net
+      - attachment_hsl_direct_net_3
+      attachment_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - attachment
     requirements:
-      link_port_0_service_instance1:
-      - service_instance1
-      - link_port_0
       dependency_service_instance3:
       - service_instance3
       - dependency
-      dependency_hsl_direct_net:
-      - hsl_direct_net
-      - dependency
-      dependency_hsl_direct_net_test_nested3:
-      - test_nested3
-      - dependency_hsl_direct_net
+      network_service_policy_2:
+      - service_policy_2
+      - network
       link_port_0_service_instance3:
       - service_instance3
       - link_port_0
-      network_service_policy:
-      - service_policy
-      - network
-      link_port_2_service_instance1:
-      - service_instance1
+      dependency_hsl_direct_net_3_test_nested3:
+      - test_nested3
+      - dependency_hsl_direct_net_3
+      link_port_2_service_instance21:
+      - service_instance21
       - link_port_2
       link_port_0_service_instance4_test_nested3:
       - test_nested3
       - link_port_0_service_instance4
-      dependency_service_policy:
-      - service_policy
+      dependency_hsl_direct_net_2:
+      - hsl_direct_net_2
       - dependency
       link_port_2_service_instance3:
       - service_instance3
       - link_port_2
-      network_service_policy_test_nested3:
+      link_port_1_service_instance21:
+      - service_instance21
+      - link_port_1
+      dependency_service_policy_3_test_nested3:
       - test_nested3
-      - network_service_policy
+      - dependency_service_policy_3
+      link_port_0_service_instance21:
+      - service_instance21
+      - link_port_0
       link_port_2_service_instance4_test_nested3:
       - test_nested3
       - link_port_2_service_instance4
+      dependency_service_instance21:
+      - service_instance21
+      - dependency
       dependency_test_nested3:
       - test_nested3
       - dependency
       dependency_service_instance4_test_nested3:
       - test_nested3
       - dependency_service_instance4
-      dependency_service_policy_test_nested3:
-      - test_nested3
-      - dependency_service_policy
       link_port_1_service_instance3:
       - service_instance3
       - link_port_1
-      link_port_1_service_instance1:
-      - service_instance1
-      - link_port_1
       link_port_1_service_instance4_test_nested3:
       - test_nested3
       - link_port_1_service_instance4
-      dependency_service_instance1:
-      - service_instance1
-      - dependency
\ No newline at end of file
+      dependency_service_policy_2:
+      - service_policy_2
+      - dependency
+      network_service_policy_3_test_nested3:
+      - test_nested3
+      - network_service_policy_3
\ 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/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
similarity index 94%
rename from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
rename to openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
index 19e88a7..96d57c1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
@@ -1,6 +1,6 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
-  template_name: OCS-fw2_service_instance1
+  template_name: OCS-fw2_service_instance21
 imports:
 - openecomp_heat_index:
     file: openecomp-heat/_index.yml
@@ -127,25 +127,6 @@ topology_template:
       entry_schema:
         type: boolean
   node_templates:
-    service_instance1:
-      type: org.openecomp.resource.vfc.nodes.heat.st
-      properties:
-        flavor:
-          get_input: flavor
-        image_name:
-          get_input: image_name
-        availability_zone:
-          get_input: availability_zone
-        service_type:
-          get_input: service_type
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        service_instance_name:
-          get_input: service_instance_name
-        service_mode:
-          get_input: service_mode
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
@@ -184,7 +165,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
     port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
@@ -224,7 +205,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
     port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
@@ -264,15 +245,34 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
+    service_instance21:
+      type: org.openecomp.resource.vfc.nodes.heat.st
+      properties:
+        flavor:
+          get_input: flavor
+        image_name:
+          get_input: image_name
+        availability_zone:
+          get_input: availability_zone
+        service_type:
+          get_input: service_type
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
+        service_instance_name:
+          get_input: service_instance_name
+        service_mode:
+          get_input: service_mode
   groups:
-    service_instance1_group:
+    service_instance21_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
         heat_file: ../Artifacts/OCS-fw2.yml
       members:
-      - service_instance1
+      - service_instance21
       - port_0
       - port_1
       - port_2
@@ -281,52 +281,52 @@ topology_template:
       description: Tenant id of the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - tenant_id
     fq_name:
       description: The FQ name of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - fq_name
     service_template_name:
       description: Service Template of the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - service_template_name
     show:
       description: All attributes
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - show
     active_vms:
       description: Number of service VMs active for this Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - active_vms
     service_instance_name:
       description: The name of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - service_instance_name
     virtual_machines:
       description: Service VMs for the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - virtual_machines
     status:
       description: Status of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2
     requirements:
       link_port_0:
       - port_0
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - link
\ No newline at end of file
+      - link

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 0f74dfe..1e540ee 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -326,7 +326,7 @@ topology_template:
         - service_instance3
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2
     requirements:
       link_port_0:
       - port_0

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
index c703fdb..b164684 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
@@ -153,8 +153,19 @@ topology_template:
       type: string
       description: HSL (Logging) network address (CIDR notation)
   node_templates:
+    hsl_direct_net_3:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        network_name:
+          get_input: HSL_direct_net_id
+        subnets:
+          hsl_ip_subnet_3:
+            cidr:
+              get_input: HSL_direct_net_cidr
+            gateway_ip:
+              get_input: HSL_direct_net_gateway
     service_instance4:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_3
       directives:
       - substitutable
       properties:
@@ -228,20 +239,9 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
+          node: hsl_direct_net_3
           relationship: tosca.relationships.DependsOn
-    hsl_direct_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        network_name:
-          get_input: HSL_direct_net_id
-        subnets:
-          hsl_ip_subnet:
-            cidr:
-              get_input: HSL_direct_net_cidr
-            gateway_ip:
-              get_input: HSL_direct_net_gateway
-    service_policy:
+    service_policy_3:
       type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
       properties:
         entries:
@@ -283,48 +283,48 @@ topology_template:
         description: |
           Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
       members:
+      - hsl_direct_net_3
       - service_instance4
-      - hsl_direct_net
-      - service_policy
+      - service_policy_3
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
     capabilities:
-      link_hsl_direct_net:
-      - hsl_direct_net
+      end_point_hsl_direct_net_3:
+      - hsl_direct_net_3
+      - end_point
+      link_hsl_direct_net_3:
+      - hsl_direct_net_3
       - link
-      feature_service_policy:
-      - service_policy
-      - feature
       feature_service_instance4:
       - service_instance4
       - feature
-      attachment_hsl_direct_net:
-      - hsl_direct_net
-      - attachment
-      feature_hsl_direct_net:
-      - hsl_direct_net
+      feature_hsl_direct_net_3:
+      - hsl_direct_net_3
       - feature
-      end_point_hsl_direct_net:
-      - hsl_direct_net
-      - end_point
+      feature_service_policy_3:
+      - service_policy_3
+      - feature
+      attachment_hsl_direct_net_3:
+      - hsl_direct_net_3
+      - attachment
     requirements:
       dependency_service_instance4:
       - service_instance4
       - dependency
-      dependency_hsl_direct_net:
-      - hsl_direct_net
-      - dependency
+      network_service_policy_3:
+      - service_policy_3
+      - network
       link_port_0_service_instance4:
       - service_instance4
       - link_port_0
       link_port_1_service_instance4:
       - service_instance4
       - link_port_1
-      network_service_policy:
-      - service_policy
-      - network
-      dependency_service_policy:
-      - service_policy
+      dependency_service_policy_3:
+      - service_policy_3
+      - dependency
+      dependency_hsl_direct_net_3:
+      - hsl_direct_net_3
       - dependency
       link_port_2_service_instance4:
       - service_instance4

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index bb8a6c0..14b7afc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -326,7 +326,7 @@ topology_template:
         - service_instance4
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_3
     requirements:
       link_port_0:
       - port_0

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
index 2bfeeb0..dbd3ad9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
@@ -379,72 +379,72 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
     capabilities:
-      feature_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - feature_hsl_direct_net_test_nested3
       feature_service_instance1:
       - service_instance1
       - feature
-      feature_service_policy_test_nested2:
+      attachment_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - feature_service_policy
+      - attachment_hsl_direct_net_3_test_nested3
       feature_service_instance2:
       - service_instance2
       - feature
       feature_test_nested3_test_nested2:
       - test_nested2
       - feature_test_nested3
+      end_point_hsl_direct_net_3_test_nested3_test_nested2:
+      - test_nested2
+      - end_point_hsl_direct_net_3_test_nested3
       attachment_hsl_direct_net:
       - hsl_direct_net
       - attachment
       feature_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - feature_service_instance4_test_nested3
+      end_point_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - end_point_hsl_direct_net_2
       feature_service_instance3_test_nested2:
       - test_nested2
       - feature_service_instance3
-      feature_hsl_direct_net_test_nested2:
-      - test_nested2
-      - feature_hsl_direct_net
-      end_point_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - end_point_hsl_direct_net_test_nested3
       end_point_hsl_direct_net:
       - hsl_direct_net
       - end_point
+      feature_service_policy_2_test_nested2:
+      - test_nested2
+      - feature_service_policy_2
+      link_hsl_direct_net_3_test_nested3_test_nested2:
+      - test_nested2
+      - link_hsl_direct_net_3_test_nested3
       link_hsl_direct_net:
       - hsl_direct_net
       - link
       feature_service_policy:
       - service_policy
       - feature
-      link_hsl_direct_net_test_nested2:
-      - test_nested2
-      - link_hsl_direct_net
-      attachment_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - attachment_hsl_direct_net_test_nested3
-      attachment_hsl_direct_net_test_nested2:
-      - test_nested2
-      - attachment_hsl_direct_net
-      feature_service_instance1_test_nested2:
+      feature_hsl_direct_net_2_test_nested2:
       - test_nested2
-      - feature_service_instance1
-      link_hsl_direct_net_test_nested3_test_nested2:
+      - feature_hsl_direct_net_2
+      link_hsl_direct_net_2_test_nested2:
       - test_nested2
-      - link_hsl_direct_net_test_nested3
+      - link_hsl_direct_net_2
       feature_test_nested2:
       - test_nested2
       - feature
       feature_hsl_direct_net:
       - hsl_direct_net
       - feature
-      feature_service_policy_test_nested3_test_nested2:
+      feature_service_policy_3_test_nested3_test_nested2:
       - test_nested2
-      - feature_service_policy_test_nested3
-      end_point_hsl_direct_net_test_nested2:
+      - feature_service_policy_3_test_nested3
+      feature_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - end_point_hsl_direct_net
+      - feature_hsl_direct_net_3_test_nested3
+      feature_service_instance21_test_nested2:
+      - test_nested2
+      - feature_service_instance21
+      attachment_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - attachment_hsl_direct_net_2
     requirements:
       link_port_1_service_instance4_test_nested3_test_nested2:
       - test_nested2
@@ -452,15 +452,9 @@ topology_template:
       dependency_hsl_direct_net:
       - hsl_direct_net
       - dependency
-      dependency_hsl_direct_net_test_nested2:
-      - test_nested2
-      - dependency_hsl_direct_net
-      dependency_hsl_direct_net_test_nested3_test_nested2:
+      network_service_policy_3_test_nested3_test_nested2:
       - test_nested2
-      - dependency_hsl_direct_net_test_nested3
-      network_service_policy_test_nested3_test_nested2:
-      - test_nested2
-      - network_service_policy_test_nested3
+      - network_service_policy_3_test_nested3
       link_port_2_service_instance1:
       - service_instance1
       - link_port_2
@@ -470,9 +464,6 @@ topology_template:
       dependency_service_policy:
       - service_policy
       - dependency
-      dependency_service_instance1_test_nested2:
-      - test_nested2
-      - dependency_service_instance1
       link_port_0_service_instance3_test_nested2:
       - test_nested2
       - link_port_0_service_instance3
@@ -482,21 +473,21 @@ topology_template:
       dependency_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - dependency_service_instance4_test_nested3
-      dependency_service_policy_test_nested2:
+      dependency_service_instance21_test_nested2:
       - test_nested2
-      - dependency_service_policy
+      - dependency_service_instance21
       dependency_test_nested2:
       - test_nested2
       - dependency
-      link_port_0_service_instance1_test_nested2:
-      - test_nested2
-      - link_port_0_service_instance1
       link_port_1_service_instance2:
       - service_instance2
       - link_port_1
       link_port_1_service_instance1:
       - service_instance1
       - link_port_1
+      link_port_2_service_instance21_test_nested2:
+      - test_nested2
+      - link_port_2_service_instance21
       link_port_1_service_instance3_test_nested2:
       - test_nested2
       - link_port_1_service_instance3
@@ -509,24 +500,33 @@ topology_template:
       link_port_0_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - link_port_0_service_instance4_test_nested3
-      dependency_service_policy_test_nested3_test_nested2:
+      dependency_service_policy_2_test_nested2:
       - test_nested2
-      - dependency_service_policy_test_nested3
-      link_port_1_service_instance1_test_nested2:
+      - dependency_service_policy_2
+      link_port_0_service_instance21_test_nested2:
       - test_nested2
-      - link_port_1_service_instance1
+      - link_port_0_service_instance21
       network_service_policy:
       - service_policy
       - network
-      network_service_policy_test_nested2:
+      dependency_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - dependency_hsl_direct_net_2
+      dependency_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - network_service_policy
+      - dependency_hsl_direct_net_3_test_nested3
+      dependency_service_policy_3_test_nested3_test_nested2:
+      - test_nested2
+      - dependency_service_policy_3_test_nested3
       dependency_service_instance3_test_nested2:
       - test_nested2
       - dependency_service_instance3
-      link_port_2_service_instance1_test_nested2:
+      link_port_1_service_instance21_test_nested2:
+      - test_nested2
+      - link_port_1_service_instance21
+      network_service_policy_2_test_nested2:
       - test_nested2
-      - link_port_2_service_instance1
+      - network_service_policy_2
       dependency_test_nested3_test_nested2:
       - test_nested2
       - dependency_test_nested3

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml
index 7abef08..b5c3dcb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw2.yml
@@ -92,19 +92,19 @@ parameters:
 
 resources:
 
-  hsl_direct_net:
+  hsl_direct_net_2:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: HSL_direct_net_id }
 
-  hsl_ip_subnet:
+  hsl_ip_subnet_2:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: hsl_direct_net }
+      network_id: { get_resource: hsl_direct_net_2 }
       cidr: { get_param: HSL_direct_net_cidr }
       gateway_ip: { get_param: HSL_direct_net_gateway }
 
-  service_template:
+  service_template_2:
     type: OS::Contrail::ServiceTemplate
     properties:
       name: { get_param: st_name }
@@ -119,11 +119,11 @@ resources:
 
   service_instance3:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_2]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_2 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -138,13 +138,13 @@ resources:
           }
           ]
 
-  service_instance1:
+  service_instance21:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_2]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_2 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -159,7 +159,7 @@ resources:
           }
           ]
 
-  service_policy:
+  service_policy_2:
     type: OS::Contrail::NetworkPolicy
     depends_on: [ service_instance3 ]
     properties:
@@ -177,19 +177,19 @@ resources:
           },
           ]
 
-  service_policy_attach_direct_net:
+  service_policy_attach_direct_net_2:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_2 ]
     properties:
       network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_2, fq_name] }
 
-  service_policy_attach_protected_net:
+  service_policy_attach_protected_net_2:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_2 ]
     properties:
       network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_2, fq_name] }
 
   test_nested3:
     type: OCS-fw3.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
index 4556392..27bb720 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
@@ -92,19 +92,19 @@ parameters:
 
 resources:
 
-  hsl_direct_net:
+  hsl_direct_net_3:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: HSL_direct_net_id }
 
-  hsl_ip_subnet:
+  hsl_ip_subnet_3:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: hsl_direct_net }
+      network_id: { get_resource: hsl_direct_net_3 }
       cidr: { get_param: HSL_direct_net_cidr }
       gateway_ip: { get_param: HSL_direct_net_gateway }
 
-  service_template:
+  service_template_3:
     type: OS::Contrail::ServiceTemplate
     properties:
       name: { get_param: st_name }
@@ -119,11 +119,11 @@ resources:
 
   service_instance4:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_3]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_3 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -139,7 +139,7 @@ resources:
           ]
 
 
-  service_policy:
+  service_policy_3:
     type: OS::Contrail::NetworkPolicy
     depends_on: [ service_instance4 ]
     properties:
@@ -157,17 +157,17 @@ resources:
           },
           ]
 
-  service_policy_attach_direct_net:
+  service_policy_attach_direct_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }
 
-  service_policy_attach_protected_net:
+  service_policy_attach_protected_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }
 

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 4b348b7..ec0f41e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -153,6 +153,13 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
+    - dependency_hsl_direct_net_3:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_service_instance4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -181,21 +188,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net:
+    - dependency_service_policy_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_service_policy:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - network_service_policy:
+    - network_service_policy_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
@@ -203,13 +203,13 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      link_hsl_direct_net:
-        type: tosca.capabilities.network.Linkable
+      end_point_hsl_direct_net_3:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy:
-        type: tosca.capabilities.Node
+      link_hsl_direct_net_3:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -218,18 +218,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net:
-        type: tosca.capabilities.Attachment
+      feature_hsl_direct_net_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
+      feature_service_policy_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      attachment_hsl_direct_net_3:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -381,35 +381,21 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_service_instance1:
+    - dependency_hsl_direct_net_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_port_0_service_instance1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_1_service_instance1:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_2_service_instance1:
-        capability: tosca.capabilities.network.Linkable
+    - dependency_test_nested3:
+        capability: tosca.capabilities.Node
         node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3:
+        - 0
+        - UNBOUNDED
+    - dependency_hsl_direct_net_3_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -444,34 +430,20 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net_test_nested3:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_service_policy_test_nested3:
+    - dependency_service_policy_3_test_nested3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested3:
+    - network_service_policy_3_test_nested3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_hsl_direct_net:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_service_instance3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -500,27 +472,50 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_service_policy:
+    - dependency_service_policy_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy:
+    - network_service_policy_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    capabilities:
-      feature_service_policy_test_nested3:
-        type: tosca.capabilities.Node
+    - dependency_service_instance21:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_service_instance1:
+    - link_port_0_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2_service_instance21:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      feature_service_instance21:
         type: tosca.capabilities.Node
         occurrences:
         - 1
@@ -530,43 +525,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net:
-        type: tosca.capabilities.Attachment
+      feature_hsl_direct_net_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      feature_service_policy_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance4_test_nested3:
+      feature_service_policy_3_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net:
-        type: tosca.capabilities.network.Linkable
+      end_point_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy:
+      feature_service_instance4_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net_test_nested3:
+      feature_hsl_direct_net_3_test_nested3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested3:
+      link_hsl_direct_net_2:
         type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested3:
-        type: tosca.capabilities.Attachment
+      link_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -575,13 +570,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
-        type: tosca.capabilities.Node
+      end_point_hsl_direct_net_2:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested3:
-        type: tosca.capabilities.Endpoint
+      attachment_hsl_direct_net_3_test_nested3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_hsl_direct_net_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -796,35 +796,21 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_service_instance1_test_nested2:
+    - dependency_hsl_direct_net_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_port_0_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_1_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - link_port_2_service_instance1_test_nested2:
-        capability: tosca.capabilities.network.Linkable
+    - dependency_test_nested3_test_nested2:
+        capability: tosca.capabilities.Node
         node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3_test_nested2:
+        - 0
+        - UNBOUNDED
+    - dependency_hsl_direct_net_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
@@ -859,34 +845,20 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_hsl_direct_net_test_nested3_test_nested2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_service_policy_test_nested3_test_nested2:
+    - dependency_service_policy_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested3_test_nested2:
+    - network_service_policy_3_test_nested3_test_nested2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_hsl_direct_net_test_nested2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_service_instance3_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -915,20 +887,48 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_service_policy_test_nested2:
+    - dependency_service_policy_2_test_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - network_service_policy_test_nested2:
+    - network_service_policy_2_test_nested2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.network.Network
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_service_instance21_test_nested2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_port_0_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2_service_instance21_test_nested2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_hsl_direct_net:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -951,18 +951,13 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      feature_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_service_instance1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy_test_nested2:
-        type: tosca.capabilities.Node
+      attachment_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -976,6 +971,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      end_point_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_hsl_direct_net:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -986,23 +986,28 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance3_test_nested2:
-        type: tosca.capabilities.Node
+      end_point_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net_test_nested2:
+      feature_service_instance3_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested3_test_nested2:
+      end_point_hsl_direct_net:
         type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net:
-        type: tosca.capabilities.Endpoint
+      feature_service_policy_2_test_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      link_hsl_direct_net_3_test_nested3_test_nested2:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -1016,51 +1021,94 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.network.Linkable
+      feature_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.Attachment
+      link_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.Attachment
+      feature_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_instance1_test_nested2:
+      feature_hsl_direct_net:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      link_hsl_direct_net_test_nested3_test_nested2:
-        type: tosca.capabilities.network.Linkable
+      feature_service_policy_3_test_nested3_test_nested2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2:
+      feature_hsl_direct_net_3_test_nested3_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_hsl_direct_net:
+      feature_service_instance21_test_nested2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_service_policy_test_nested3_test_nested2:
-        type: tosca.capabilities.Node
+      attachment_hsl_direct_net_2_test_nested2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_hsl_direct_net_test_nested2:
-        type: tosca.capabilities.Endpoint
+  org.openecomp.resource.abstract.nodes.heat.service_template_3:
+    derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
+    requirements:
+    - link_port_0:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
-        - UNBOUNDED
+        - 1
+    - link_port_1:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+  org.openecomp.resource.abstract.nodes.heat.service_template_2:
+    derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
+    requirements:
+    - link_port_0:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_1:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - link_port_2:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
   org.openecomp.resource.abstract.nodes.heat.service_template:
     derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
     requirements:
@@ -1086,4 +1134,4 @@ node_types:
         - 1
         - 1
   org.openecomp.resource.vfc.nodes.heat.st:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
\ No newline at end of file
+    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
index f4dda7c..f74dda8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -85,18 +85,6 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: Internal2-net
           relationship: tosca.relationships.network.LinksTo
-      - link_port_0_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_1_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_2_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
       - link_port_0_service_instance4_test_nested3_test_nested2:
           capability: tosca.capabilities.network.Linkable
           node: Internal1-net
@@ -121,76 +109,106 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: Internal2-net
           relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+    Internal1-net-1:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        shared:
+          get_input: Internal1_shared
+        forwarding_mode:
+          get_input: Internal1_forwarding_mode
+        network_name:
+          get_input: Internal1_net_name
     test_nested1:
       type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
       directives:
       - substitutable
       properties:
-        network_param2: Internal2-net
+        network_param2: Internal2-net-1
         service_template_filter:
           substitute_service_template: OCS-fwServiceTemplate.yaml
-        network_param1: Internal1-net
+        network_param1: Internal1-net-1
       requirements:
       - link_port_0_service_instance2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
+          node: Internal2-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_1_service_instance2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_2_service_instance2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
+          node: Internal2-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_0_service_instance1:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_1_service_instance1:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_2_service_instance1:
           capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_0_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_1_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
-          relationship: tosca.relationships.network.LinksTo
-      - link_port_2_service_instance1_test_nested2:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
+          node: Internal2-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_0_service_instance4_test_nested3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_1_service_instance4_test_nested3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_2_service_instance4_test_nested3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_0_service_instance3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_1_service_instance3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
+          node: Internal1-net-1
           relationship: tosca.relationships.network.LinksTo
       - link_port_2_service_instance3_test_nested2:
           capability: tosca.capabilities.network.Linkable
-          node: Internal2-net
+          node: Internal2-net-1
           relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net-1
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net-1
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance21_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net-1
+          relationship: tosca.relationships.network.LinksTo
+    Internal2-net-1:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        shared:
+          get_input: Internal1_shared
+        forwarding_mode:
+          get_input: Internal1_forwarding_mode
+        network_name:
+          get_input: Internal1_net_name
   groups:
     base_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -207,6 +225,6 @@ topology_template:
         heat_file: ../Artifacts/addOn.yml
         description: ASC External Networks Template
       members:
-      - Internal2-net
-      - Internal1-net
-      - test_nested1
\ No newline at end of file
+      - Internal1-net-1
+      - test_nested1
+      - Internal2-net-1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
index 4394a39..d456191 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2ServiceTemplate.yaml
@@ -153,8 +153,30 @@ topology_template:
       type: string
       description: HSL (Logging) network address (CIDR notation)
   node_templates:
-    service_instance1:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+    hsl_direct_net_2:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        network_name:
+          get_input: HSL_direct_net_id
+        subnets:
+          hsl_ip_subnet_2:
+            cidr:
+              get_input: HSL_direct_net_cidr
+            gateway_ip:
+              get_input: HSL_direct_net_gateway
+    test_nested3:
+      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
+      directives:
+      - substitutable
+      properties:
+        network_param2:
+          get_input: network_param1
+        service_template_filter:
+          substitute_service_template: OCS-fw3ServiceTemplate.yaml
+        network_param1:
+          get_input: network_param1
+    service_instance3:
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_2
       directives:
       - substitutable
       properties:
@@ -165,7 +187,7 @@ topology_template:
         image_name:
           get_input: st_image_name
         service_template_filter:
-          substitute_service_template: OCS-fw2_service_instance1ServiceTemplate.yaml
+          substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml
           count:
             get_input: max_num_fw_instances
           scaling_enabled:
@@ -205,7 +227,7 @@ topology_template:
           get_input: service_instance_name
         interface_list:
         - virtual_network:
-            get_input: network_param2
+            get_input: network_param1
         - virtual_network:
             get_input: network_param1
         - virtual_network:
@@ -228,32 +250,44 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
+          node: hsl_direct_net_2
           relationship: tosca.relationships.DependsOn
-    test_nested3:
-      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
-      directives:
-      - substitutable
-      properties:
-        network_param2:
-          get_input: network_param1
-        service_template_filter:
-          substitute_service_template: OCS-fw3ServiceTemplate.yaml
-        network_param1:
-          get_input: network_param1
-    hsl_direct_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+    service_policy_2:
+      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
       properties:
-        network_name:
-          get_input: HSL_direct_net_id
-        subnets:
-          hsl_ip_subnet:
-            cidr:
-              get_input: HSL_direct_net_cidr
-            gateway_ip:
-              get_input: HSL_direct_net_gateway
-    service_instance3:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+        entries:
+          policy_rule:
+          - src_ports:
+            - start_port:
+                get_input: start_src_ports
+              end_port:
+                get_input: end_src_ports
+            protocol: any
+            action_list:
+              apply_service:
+              - service_instance3
+            dst_addresses:
+            - virtual_network:
+                get_input: Cricket_OCS_direct_net_id
+            dst_ports:
+            - start_port:
+                get_input: start_dst_ports
+              end_port:
+                get_input: end_dst_ports
+            src_addresses:
+            - virtual_network:
+                get_input: Cricket_OCS_protected_net_id
+            direction:
+              get_input: service_policy_direction
+        name:
+          get_input: service_policy_name
+      requirements:
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: service_instance3
+          relationship: tosca.relationships.DependsOn
+    service_instance21:
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_2
       directives:
       - substitutable
       properties:
@@ -264,7 +298,7 @@ topology_template:
         image_name:
           get_input: st_image_name
         service_template_filter:
-          substitute_service_template: OCS-fw2_service_instance3ServiceTemplate.yaml
+          substitute_service_template: OCS-fw2_service_instance21ServiceTemplate.yaml
           count:
             get_input: max_num_fw_instances
           scaling_enabled:
@@ -304,7 +338,7 @@ topology_template:
           get_input: service_instance_name
         interface_list:
         - virtual_network:
-            get_input: network_param1
+            get_input: network_param2
         - virtual_network:
             get_input: network_param1
         - virtual_network:
@@ -327,41 +361,7 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
-          relationship: tosca.relationships.DependsOn
-    service_policy:
-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
-      properties:
-        entries:
-          policy_rule:
-          - src_ports:
-            - start_port:
-                get_input: start_src_ports
-              end_port:
-                get_input: end_src_ports
-            protocol: any
-            action_list:
-              apply_service:
-              - service_instance3
-            dst_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_direct_net_id
-            dst_ports:
-            - start_port:
-                get_input: start_dst_ports
-              end_port:
-                get_input: end_dst_ports
-            src_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_protected_net_id
-            direction:
-              get_input: service_policy_direction
-        name:
-          get_input: service_policy_name
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: service_instance3
+          node: hsl_direct_net_2
           relationship: tosca.relationships.DependsOn
   groups:
     OCS-fw2_group:
@@ -371,111 +371,111 @@ topology_template:
         description: |
           Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
       members:
-      - service_instance1
+      - hsl_direct_net_2
       - test_nested3
-      - hsl_direct_net
       - service_instance3
-      - service_policy
+      - service_policy_2
+      - service_instance21
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw2
     capabilities:
-      feature_service_policy_test_nested3:
-      - test_nested3
-      - feature_service_policy
-      feature_service_instance1:
-      - service_instance1
+      feature_service_instance21:
+      - service_instance21
       - feature
       feature_service_instance3:
       - service_instance3
       - feature
-      attachment_hsl_direct_net:
-      - hsl_direct_net
-      - attachment
-      end_point_hsl_direct_net:
-      - hsl_direct_net
-      - end_point
+      feature_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - feature
+      feature_service_policy_2:
+      - service_policy_2
+      - feature
+      feature_service_policy_3_test_nested3:
+      - test_nested3
+      - feature_service_policy_3
+      end_point_hsl_direct_net_3_test_nested3:
+      - test_nested3
+      - end_point_hsl_direct_net_3
       feature_service_instance4_test_nested3:
       - test_nested3
       - feature_service_instance4
-      link_hsl_direct_net:
-      - hsl_direct_net
-      - link
-      feature_service_policy:
-      - service_policy
-      - feature
-      feature_hsl_direct_net_test_nested3:
-      - test_nested3
-      - feature_hsl_direct_net
-      link_hsl_direct_net_test_nested3:
+      feature_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - link_hsl_direct_net
-      attachment_hsl_direct_net_test_nested3:
+      - feature_hsl_direct_net_3
+      link_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - link
+      link_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - attachment_hsl_direct_net
+      - link_hsl_direct_net_3
       feature_test_nested3:
       - test_nested3
       - feature
-      feature_hsl_direct_net:
-      - hsl_direct_net
-      - feature
-      end_point_hsl_direct_net_test_nested3:
+      end_point_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - end_point
+      attachment_hsl_direct_net_3_test_nested3:
       - test_nested3
-      - end_point_hsl_direct_net
+      - attachment_hsl_direct_net_3
+      attachment_hsl_direct_net_2:
+      - hsl_direct_net_2
+      - attachment
     requirements:
-      link_port_0_service_instance1:
-      - service_instance1
-      - link_port_0
       dependency_service_instance3:
       - service_instance3
       - dependency
-      dependency_hsl_direct_net:
-      - hsl_direct_net
-      - dependency
-      dependency_hsl_direct_net_test_nested3:
-      - test_nested3
-      - dependency_hsl_direct_net
+      network_service_policy_2:
+      - service_policy_2
+      - network
       link_port_0_service_instance3:
       - service_instance3
       - link_port_0
-      network_service_policy:
-      - service_policy
-      - network
-      link_port_2_service_instance1:
-      - service_instance1
+      dependency_hsl_direct_net_3_test_nested3:
+      - test_nested3
+      - dependency_hsl_direct_net_3
+      link_port_2_service_instance21:
+      - service_instance21
       - link_port_2
       link_port_0_service_instance4_test_nested3:
       - test_nested3
       - link_port_0_service_instance4
-      dependency_service_policy:
-      - service_policy
+      dependency_hsl_direct_net_2:
+      - hsl_direct_net_2
       - dependency
       link_port_2_service_instance3:
       - service_instance3
       - link_port_2
-      network_service_policy_test_nested3:
+      link_port_1_service_instance21:
+      - service_instance21
+      - link_port_1
+      dependency_service_policy_3_test_nested3:
       - test_nested3
-      - network_service_policy
+      - dependency_service_policy_3
+      link_port_0_service_instance21:
+      - service_instance21
+      - link_port_0
       link_port_2_service_instance4_test_nested3:
       - test_nested3
       - link_port_2_service_instance4
+      dependency_service_instance21:
+      - service_instance21
+      - dependency
       dependency_test_nested3:
       - test_nested3
       - dependency
       dependency_service_instance4_test_nested3:
       - test_nested3
       - dependency_service_instance4
-      dependency_service_policy_test_nested3:
-      - test_nested3
-      - dependency_service_policy
       link_port_1_service_instance3:
       - service_instance3
       - link_port_1
-      link_port_1_service_instance1:
-      - service_instance1
-      - link_port_1
       link_port_1_service_instance4_test_nested3:
       - test_nested3
       - link_port_1_service_instance4
-      dependency_service_instance1:
-      - service_instance1
-      - dependency
\ No newline at end of file
+      dependency_service_policy_2:
+      - service_policy_2
+      - dependency
+      network_service_policy_3_test_nested3:
+      - test_nested3
+      - network_service_policy_3
\ 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
similarity index 94%
rename from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
rename to openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
index 19e88a7..96d57c1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance21ServiceTemplate.yaml
@@ -1,6 +1,6 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
-  template_name: OCS-fw2_service_instance1
+  template_name: OCS-fw2_service_instance21
 imports:
 - openecomp_heat_index:
     file: openecomp-heat/_index.yml
@@ -127,25 +127,6 @@ topology_template:
       entry_schema:
         type: boolean
   node_templates:
-    service_instance1:
-      type: org.openecomp.resource.vfc.nodes.heat.st
-      properties:
-        flavor:
-          get_input: flavor
-        image_name:
-          get_input: image_name
-        availability_zone:
-          get_input: availability_zone
-        service_type:
-          get_input: service_type
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        service_instance_name:
-          get_input: service_instance_name
-        service_mode:
-          get_input: service_mode
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
@@ -184,7 +165,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
     port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
@@ -224,7 +205,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
     port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
@@ -264,15 +245,34 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: service_instance1
+          node: service_instance21
           relationship: tosca.relationships.network.BindsTo
+    service_instance21:
+      type: org.openecomp.resource.vfc.nodes.heat.st
+      properties:
+        flavor:
+          get_input: flavor
+        image_name:
+          get_input: image_name
+        availability_zone:
+          get_input: availability_zone
+        service_type:
+          get_input: service_type
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
+        service_instance_name:
+          get_input: service_instance_name
+        service_mode:
+          get_input: service_mode
   groups:
-    service_instance1_group:
+    service_instance21_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
         heat_file: ../Artifacts/OCS-fw2.yml
       members:
-      - service_instance1
+      - service_instance21
       - port_0
       - port_1
       - port_2
@@ -281,52 +281,52 @@ topology_template:
       description: Tenant id of the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - tenant_id
     fq_name:
       description: The FQ name of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - fq_name
     service_template_name:
       description: Service Template of the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - service_template_name
     show:
       description: All attributes
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - show
     active_vms:
       description: Number of service VMs active for this Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - active_vms
     service_instance_name:
       description: The name of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - service_instance_name
     virtual_machines:
       description: Service VMs for the Service Instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - virtual_machines
     status:
       description: Status of the service instance
       value:
         get_attribute:
-        - service_instance1
+        - service_instance21
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2
     requirements:
       link_port_0:
       - port_0
@@ -336,4 +336,4 @@ topology_template:
       - link
       link_port_2:
       - port_2
-      - link
\ No newline at end of file
+      - link

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index 0f74dfe..1e540ee 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -326,7 +326,7 @@ topology_template:
         - service_instance3
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_2
     requirements:
       link_port_0:
       - port_0

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
index c703fdb..b164684 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3ServiceTemplate.yaml
@@ -153,8 +153,19 @@ topology_template:
       type: string
       description: HSL (Logging) network address (CIDR notation)
   node_templates:
+    hsl_direct_net_3:
+      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
+      properties:
+        network_name:
+          get_input: HSL_direct_net_id
+        subnets:
+          hsl_ip_subnet_3:
+            cidr:
+              get_input: HSL_direct_net_cidr
+            gateway_ip:
+              get_input: HSL_direct_net_gateway
     service_instance4:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
+      type: org.openecomp.resource.abstract.nodes.heat.service_template_3
       directives:
       - substitutable
       properties:
@@ -228,20 +239,9 @@ topology_template:
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
-          node: hsl_direct_net
+          node: hsl_direct_net_3
           relationship: tosca.relationships.DependsOn
-    hsl_direct_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        network_name:
-          get_input: HSL_direct_net_id
-        subnets:
-          hsl_ip_subnet:
-            cidr:
-              get_input: HSL_direct_net_cidr
-            gateway_ip:
-              get_input: HSL_direct_net_gateway
-    service_policy:
+    service_policy_3:
       type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
       properties:
         entries:
@@ -283,48 +283,48 @@ topology_template:
         description: |
           Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
       members:
+      - hsl_direct_net_3
       - service_instance4
-      - hsl_direct_net
-      - service_policy
+      - service_policy_3
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw3
     capabilities:
-      link_hsl_direct_net:
-      - hsl_direct_net
+      end_point_hsl_direct_net_3:
+      - hsl_direct_net_3
+      - end_point
+      link_hsl_direct_net_3:
+      - hsl_direct_net_3
       - link
-      feature_service_policy:
-      - service_policy
-      - feature
       feature_service_instance4:
       - service_instance4
       - feature
-      attachment_hsl_direct_net:
-      - hsl_direct_net
-      - attachment
-      feature_hsl_direct_net:
-      - hsl_direct_net
+      feature_hsl_direct_net_3:
+      - hsl_direct_net_3
       - feature
-      end_point_hsl_direct_net:
-      - hsl_direct_net
-      - end_point
+      feature_service_policy_3:
+      - service_policy_3
+      - feature
+      attachment_hsl_direct_net_3:
+      - hsl_direct_net_3
+      - attachment
     requirements:
       dependency_service_instance4:
       - service_instance4
       - dependency
-      dependency_hsl_direct_net:
-      - hsl_direct_net
-      - dependency
+      network_service_policy_3:
+      - service_policy_3
+      - network
       link_port_0_service_instance4:
       - service_instance4
       - link_port_0
       link_port_1_service_instance4:
       - service_instance4
       - link_port_1
-      network_service_policy:
-      - service_policy
-      - network
-      dependency_service_policy:
-      - service_policy
+      dependency_service_policy_3:
+      - service_policy_3
+      - dependency
+      dependency_hsl_direct_net_3:
+      - hsl_direct_net_3
       - dependency
       link_port_2_service_instance4:
       - service_instance4

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index bb8a6c0..14b7afc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -326,7 +326,7 @@ topology_template:
         - service_instance4
         - status
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
+    node_type: org.openecomp.resource.abstract.nodes.heat.service_template_3
     requirements:
       link_port_0:
       - port_0

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
index 2bfeeb0..dbd3ad9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
@@ -379,72 +379,72 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
     capabilities:
-      feature_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - feature_hsl_direct_net_test_nested3
       feature_service_instance1:
       - service_instance1
       - feature
-      feature_service_policy_test_nested2:
+      attachment_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - feature_service_policy
+      - attachment_hsl_direct_net_3_test_nested3
       feature_service_instance2:
       - service_instance2
       - feature
       feature_test_nested3_test_nested2:
       - test_nested2
       - feature_test_nested3
+      end_point_hsl_direct_net_3_test_nested3_test_nested2:
+      - test_nested2
+      - end_point_hsl_direct_net_3_test_nested3
       attachment_hsl_direct_net:
       - hsl_direct_net
       - attachment
       feature_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - feature_service_instance4_test_nested3
+      end_point_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - end_point_hsl_direct_net_2
       feature_service_instance3_test_nested2:
       - test_nested2
       - feature_service_instance3
-      feature_hsl_direct_net_test_nested2:
-      - test_nested2
-      - feature_hsl_direct_net
-      end_point_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - end_point_hsl_direct_net_test_nested3
       end_point_hsl_direct_net:
       - hsl_direct_net
       - end_point
+      feature_service_policy_2_test_nested2:
+      - test_nested2
+      - feature_service_policy_2
+      link_hsl_direct_net_3_test_nested3_test_nested2:
+      - test_nested2
+      - link_hsl_direct_net_3_test_nested3
       link_hsl_direct_net:
       - hsl_direct_net
       - link
       feature_service_policy:
       - service_policy
       - feature
-      link_hsl_direct_net_test_nested2:
-      - test_nested2
-      - link_hsl_direct_net
-      attachment_hsl_direct_net_test_nested3_test_nested2:
-      - test_nested2
-      - attachment_hsl_direct_net_test_nested3
-      attachment_hsl_direct_net_test_nested2:
-      - test_nested2
-      - attachment_hsl_direct_net
-      feature_service_instance1_test_nested2:
+      feature_hsl_direct_net_2_test_nested2:
       - test_nested2
-      - feature_service_instance1
-      link_hsl_direct_net_test_nested3_test_nested2:
+      - feature_hsl_direct_net_2
+      link_hsl_direct_net_2_test_nested2:
       - test_nested2
-      - link_hsl_direct_net_test_nested3
+      - link_hsl_direct_net_2
       feature_test_nested2:
       - test_nested2
       - feature
       feature_hsl_direct_net:
       - hsl_direct_net
       - feature
-      feature_service_policy_test_nested3_test_nested2:
+      feature_service_policy_3_test_nested3_test_nested2:
       - test_nested2
-      - feature_service_policy_test_nested3
-      end_point_hsl_direct_net_test_nested2:
+      - feature_service_policy_3_test_nested3
+      feature_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - end_point_hsl_direct_net
+      - feature_hsl_direct_net_3_test_nested3
+      feature_service_instance21_test_nested2:
+      - test_nested2
+      - feature_service_instance21
+      attachment_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - attachment_hsl_direct_net_2
     requirements:
       link_port_1_service_instance4_test_nested3_test_nested2:
       - test_nested2
@@ -452,15 +452,9 @@ topology_template:
       dependency_hsl_direct_net:
       - hsl_direct_net
       - dependency
-      dependency_hsl_direct_net_test_nested2:
-      - test_nested2
-      - dependency_hsl_direct_net
-      dependency_hsl_direct_net_test_nested3_test_nested2:
+      network_service_policy_3_test_nested3_test_nested2:
       - test_nested2
-      - dependency_hsl_direct_net_test_nested3
-      network_service_policy_test_nested3_test_nested2:
-      - test_nested2
-      - network_service_policy_test_nested3
+      - network_service_policy_3_test_nested3
       link_port_2_service_instance1:
       - service_instance1
       - link_port_2
@@ -470,9 +464,6 @@ topology_template:
       dependency_service_policy:
       - service_policy
       - dependency
-      dependency_service_instance1_test_nested2:
-      - test_nested2
-      - dependency_service_instance1
       link_port_0_service_instance3_test_nested2:
       - test_nested2
       - link_port_0_service_instance3
@@ -482,21 +473,21 @@ topology_template:
       dependency_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - dependency_service_instance4_test_nested3
-      dependency_service_policy_test_nested2:
+      dependency_service_instance21_test_nested2:
       - test_nested2
-      - dependency_service_policy
+      - dependency_service_instance21
       dependency_test_nested2:
       - test_nested2
       - dependency
-      link_port_0_service_instance1_test_nested2:
-      - test_nested2
-      - link_port_0_service_instance1
       link_port_1_service_instance2:
       - service_instance2
       - link_port_1
       link_port_1_service_instance1:
       - service_instance1
       - link_port_1
+      link_port_2_service_instance21_test_nested2:
+      - test_nested2
+      - link_port_2_service_instance21
       link_port_1_service_instance3_test_nested2:
       - test_nested2
       - link_port_1_service_instance3
@@ -509,24 +500,33 @@ topology_template:
       link_port_0_service_instance4_test_nested3_test_nested2:
       - test_nested2
       - link_port_0_service_instance4_test_nested3
-      dependency_service_policy_test_nested3_test_nested2:
+      dependency_service_policy_2_test_nested2:
       - test_nested2
-      - dependency_service_policy_test_nested3
-      link_port_1_service_instance1_test_nested2:
+      - dependency_service_policy_2
+      link_port_0_service_instance21_test_nested2:
       - test_nested2
-      - link_port_1_service_instance1
+      - link_port_0_service_instance21
       network_service_policy:
       - service_policy
       - network
-      network_service_policy_test_nested2:
+      dependency_hsl_direct_net_2_test_nested2:
+      - test_nested2
+      - dependency_hsl_direct_net_2
+      dependency_hsl_direct_net_3_test_nested3_test_nested2:
       - test_nested2
-      - network_service_policy
+      - dependency_hsl_direct_net_3_test_nested3
+      dependency_service_policy_3_test_nested3_test_nested2:
+      - test_nested2
+      - dependency_service_policy_3_test_nested3
       dependency_service_instance3_test_nested2:
       - test_nested2
       - dependency_service_instance3
-      link_port_2_service_instance1_test_nested2:
+      link_port_1_service_instance21_test_nested2:
+      - test_nested2
+      - link_port_1_service_instance21
+      network_service_policy_2_test_nested2:
       - test_nested2
-      - link_port_2_service_instance1
+      - network_service_policy_2
       dependency_test_nested3_test_nested2:
       - test_nested2
       - dependency_test_nested3

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml
index 7abef08..b5c3dcb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw2.yml
@@ -92,19 +92,19 @@ parameters:
 
 resources:
 
-  hsl_direct_net:
+  hsl_direct_net_2:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: HSL_direct_net_id }
 
-  hsl_ip_subnet:
+  hsl_ip_subnet_2:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: hsl_direct_net }
+      network_id: { get_resource: hsl_direct_net_2 }
       cidr: { get_param: HSL_direct_net_cidr }
       gateway_ip: { get_param: HSL_direct_net_gateway }
 
-  service_template:
+  service_template_2:
     type: OS::Contrail::ServiceTemplate
     properties:
       name: { get_param: st_name }
@@ -119,11 +119,11 @@ resources:
 
   service_instance3:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_2]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_2 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -138,13 +138,13 @@ resources:
           }
           ]
 
-  service_instance1:
+  service_instance21:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_2]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_2 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -159,7 +159,7 @@ resources:
           }
           ]
 
-  service_policy:
+  service_policy_2:
     type: OS::Contrail::NetworkPolicy
     depends_on: [ service_instance3 ]
     properties:
@@ -177,19 +177,19 @@ resources:
           },
           ]
 
-  service_policy_attach_direct_net:
+  service_policy_attach_direct_net_2:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_2 ]
     properties:
       network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_2, fq_name] }
 
-  service_policy_attach_protected_net:
+  service_policy_attach_protected_net_2:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_2 ]
     properties:
       network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_2, fq_name] }
 
   test_nested3:
     type: OCS-fw3.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml
index 4556392..27bb720 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/OCS-fw3.yml
@@ -92,19 +92,19 @@ parameters:
 
 resources:
 
-  hsl_direct_net:
+  hsl_direct_net_3:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: HSL_direct_net_id }
 
-  hsl_ip_subnet:
+  hsl_ip_subnet_3:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: hsl_direct_net }
+      network_id: { get_resource: hsl_direct_net_3 }
       cidr: { get_param: HSL_direct_net_cidr }
       gateway_ip: { get_param: HSL_direct_net_gateway }
 
-  service_template:
+  service_template_3:
     type: OS::Contrail::ServiceTemplate
     properties:
       name: { get_param: st_name }
@@ -119,11 +119,11 @@ resources:
 
   service_instance4:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_3]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_3 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -139,7 +139,7 @@ resources:
           ]
 
 
-  service_policy:
+  service_policy_3:
     type: OS::Contrail::NetworkPolicy
     depends_on: [ service_instance4 ]
     properties:
@@ -157,17 +157,17 @@ resources:
           },
           ]
 
-  service_policy_attach_direct_net:
+  service_policy_attach_direct_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }
 
-  service_policy_attach_protected_net:
+  service_policy_attach_protected_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }
 

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
index 7747ff6..ceadde7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
@@ -17,13 +17,13 @@ parameters:
     type: string
 
 resources:
-  Internal1-net:
+  Internal1-net-1:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: Internal1_net_name }
       forwarding_mode: { get_param: Internal1_forwarding_mode }
       shared: { get_param: Internal1_shared }
-  Internal2-net:
+  Internal2-net-1:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: Internal1_net_name }
@@ -33,5 +33,5 @@ resources:
   test_nested1:
     type: OCS-fw.yml
     properties:
-      network_param1: { get_resource: Internal1-net}
-      network_param2: { get_resource: Internal2-net}
\ No newline at end of file
+      network_param1: { get_resource: Internal1-net-1}
+      network_param2: { get_resource: Internal2-net-1}
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml
index e2e268e..1758d49 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml
@@ -179,7 +179,7 @@ parameters:
     description: string containint the trunk parrent port
 
 resources:
-  sbg_sc_internal_0_port_0:
+  sbg_sc_internal_0_port_01:
     type: OS::Neutron::Port
     properties:
       replacement_policy: AUTO
@@ -192,7 +192,7 @@ resources:
       - ip_address: { get_param: sbg_boot_floating_ip }
       mac_address: { get_param: [sbg_internal_mac_addresses ,0] }
 
-  sbg_sc_management_1_port_0:
+  sbg_sc_management_1_port_01:
     type: OS::Neutron::Port
     properties:
       replacement_policy: AUTO
@@ -203,7 +203,7 @@ resources:
       - ip_address: { get_param: sbg_management_floating_ip }
       mac_address: { get_param: [sbg_management_mac_addresses ,0] }
 
-  sbg_sc_0:
+  sbg_sc_01:
     type: OS::Nova::Server
     properties:
       name: { get_param: [sbg_sc_names, 0]}
@@ -213,7 +213,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: sbg_sc_flavor_name }
       networks:
-      - port: { get_resource: sbg_sc_internal_0_port_0 }
-      - port: { get_resource: sbg_sc_management_1_port_0 }
+      - port: { get_resource: sbg_sc_internal_0_port_01 }
+      - port: { get_resource: sbg_sc_management_1_port_01 }
       config_drive: "true"
       user_data_format: RAW

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
index c72c019..7ba8fcc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml
@@ -356,36 +356,36 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_sbg_sc_management_1_port_0_mac_requirements:
-          mac_count_required:
-            is_required: true
         nested_avpn_net_id:
           get_input: avpn_net_id
         service_template_filter:
           substitute_service_template: nested_DPA3_New_VNF_TSBGvServiceTemplate.yaml
-        port_sbg_sc_internal_0_port_0_mac_requirements:
+        port_sbg_sc_management_1_port_01_mac_requirements:
           mac_count_required:
             is_required: true
-        port_sbg_sc_internal_0_port_0_network_role_tag: internal
-        nested_sbg_AVPN_vlan_tag_list:
-          get_input: sbg_AVPN_vlan_tag_list
-        port_sbg_sc_internal_0_port_0_ip_requirements:
+        port_sbg_sc_internal_0_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: true
-        port_sbg_sc_management_1_port_0_network_role_tag: management
-        port_sbg_sc_management_1_port_0_ip_requirements:
+        port_sbg_sc_management_1_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: true
+        nested_sbg_AVPN_vlan_tag_list:
+          get_input: sbg_AVPN_vlan_tag_list
+        port_sbg_sc_internal_0_port_01_mac_requirements:
+          mac_count_required:
+            is_required: true
+        port_sbg_sc_management_1_port_01_network_role_tag: management
         nested_sbg_avpn_ip_0:
           get_input:
           - sbg_avpn_ips
           - 0
+        port_sbg_sc_internal_0_port_01_network_role_tag: internal
         nested_avpn_subnet_id:
           get_input: avpn_subnet_id
         nested_sbg_AVPN_counter: '%index%'

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
index b6b8578..b08c486 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/in/nested-pcm_v0.1.yaml
@@ -71,15 +71,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -87,7 +87,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6bd1ea4..0d89b39 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1497,43 +1497,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1547,23 +1545,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -1572,12 +1572,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1593,36 +1587,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1638,8 +1638,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1648,14 +1648,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1675,57 +1675,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_pcm:
+      disk.write.requests_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1749,150 +1747,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      disk.root.size_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1901,6 +1881,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1954,61 +1940,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      cpu.delta_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2043,7 +2043,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2055,7 +2055,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5416,4 +5416,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index 5d47b30..2921549 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -277,8 +277,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo1C2_1:
             get_attribute:
@@ -311,30 +316,24 @@ topology_template:
             get_attribute:
             - 1c1_t2_port_0
             - tenant_id
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -342,8 +341,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -840,11 +840,11 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1032,4 +1032,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index a4746fc..2a2b7dc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,21 +57,23 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
+      type: string
+      required: true
+    port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     server_group:
       hidden: false
       immutable: false
@@ -81,11 +82,6 @@ topology_template:
       hidden: false
       immutable: false
       type: json
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -104,34 +100,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -150,36 +150,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -201,32 +201,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -239,9 +239,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -249,27 +249,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -279,18 +279,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -300,21 +318,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -327,36 +339,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -384,36 +378,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -429,31 +429,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
index 65a952d..30c7aa2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml
@@ -10,7 +10,7 @@ parameters:
 
 resources:
 
-  jsa_security_group:
+  jsa_security_group_1:
     type: OS::Neutron::SecurityGroup
     properties:
       description: ems security group
@@ -29,7 +29,7 @@ resources:
               {"direction": ingress, "ethertype": IPv6, "protocol": icmp, "remote_ip_prefix": "::/0"}
               ]
 
-  dependsOn_network:
+  dependsOn_network_0:
     type: OS::Neutron::Net
     properties:
       name:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
index 2548875..c91f0a3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml
@@ -74,8 +74,8 @@ resources:
       flavor: { get_param: pcma_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_0_0}
+        - port: { get_resource: pcm_port_1_0}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
@@ -90,15 +90,15 @@ resources:
       flavor: { get_param: pcma_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_2}
-        - port: { get_resource: pcm_port_3}
+        - port: { get_resource: pcm_port_2_0}
+        - port: { get_resource: pcm_port_3_0}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_0_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -106,7 +106,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_1_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -114,7 +114,7 @@ resources:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_2:
+  pcm_port_2_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -122,7 +122,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_3:
+  pcm_port_3_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -132,4 +132,4 @@ resources:
 
 outputs:
   portId:
-    value: { get_resource: pcm_port_3 }
\ No newline at end of file
+    value: { get_resource: pcm_port_3_0 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e44080f..4b764a3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -94,524 +94,484 @@ node_types:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_2:
+    - dependency_server_pcma2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcma2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pcm_port_1:
+        - 0
+        - UNBOUNDED
+    - dependency_server_pcma1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcma1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pcm_port_3:
+        - 0
+        - UNBOUNDED
+    - dependency_pcm_port_2_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_3:
+    - link_pcm_port_2_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcma2:
+    - dependency_pcm_port_3_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcma2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_3_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_pcma1:
+        - 1
+        - 1
+    - dependency_pcm_port_0_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcma1:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_0_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_pcm_port_1_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_1_0:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_3:
+      disk.device.iops_server_pcma2:
         type: org.openecomp.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_pcm_port_2:
+      network.outgoing.bytes.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      disk.device.iops_server_pcma1:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.bytes.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcma2:
+      disk.device.capacity_server_pcma2:
         type: org.openecomp.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_pcm_port_0:
+      disk.device.capacity_server_pcma1:
         type: org.openecomp.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_pcm_port_3:
+      disk.read.requests_server_pcma2:
         type: org.openecomp.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_pcm_port_2:
+      disk.read.requests_server_pcma1:
         type: org.openecomp.capabilities.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_pcma1:
+      disk.write.requests.rate_server_pcma1:
         type: org.openecomp.capabilities.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_pcma2:
+      network.incoming.packets_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcma1:
+      network.incoming.bytes_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pcma2:
+      disk.write.requests.rate_server_pcma2:
         type: org.openecomp.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_pcma1:
+      memory_server_pcma2:
         type: org.openecomp.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_pcma1:
+      memory_server_pcma1:
         type: org.openecomp.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_pcma2:
+      disk.device.read.bytes.rate_server_pcma1:
         type: org.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_pcma2:
+      feature_pcm_port_0_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_pcma2:
         type: org.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_pcma1:
+      disk.device.latency_server_pcma2:
         type: org.openecomp.capabilities.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_pcma1:
+      disk.device.usage_server_pcma2:
         type: org.openecomp.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_pcm_port_3:
+      disk.device.latency_server_pcma1:
         type: org.openecomp.capabilities.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_pcma2:
+      disk.device.usage_server_pcma1:
         type: org.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_pcm_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.read.requests_server_pcma1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.latency_server_pcma2:
+      network.outgoing.packets.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcma2:
+      disk.device.read.requests_server_pcma2:
         type: org.openecomp.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_pcm_port_0:
+      attachment_pcm_port_0_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcma1:
+      disk.write.bytes_server_pcma2:
         type: org.openecomp.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_pcm_port_2:
+      disk.device.read.requests.rate_server_pcma1:
         type: org.openecomp.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_pcm_port_1:
+      disk.device.read.requests.rate_server_pcma2:
         type: org.openecomp.capabilities.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_pcma1:
+      disk.write.bytes_server_pcma1:
         type: org.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_pcm_port_0:
+      binding_server_pcma1:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_pcm_port_1:
+      binding_server_pcma2:
         type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_pcm_port_2:
+      network.outgoing.bytes_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pcm_port_1_0:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_3:
+      disk.write.bytes.rate_server_pcma2:
         type: org.openecomp.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_pcm_port_3:
+      disk.write.bytes.rate_server_pcma1:
         type: org.openecomp.capabilities.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_pcma1:
+      disk.root.size_server_pcma2:
         type: org.openecomp.capabilities.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_pcma2:
+      disk.root.size_server_pcma1:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.bytes_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcma2:
+      network.outpoing.packets_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcma1:
+      disk.iops_server_pcma2:
         type: org.openecomp.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_pcm_port_2:
+      disk.iops_server_pcma1:
         type: org.openecomp.capabilities.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_pcma2:
+      network.incoming.bytes.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcma1:
+      disk.device.write.bytes.rate_server_pcma1:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pcma1:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      disk.device.write.bytes.rate_server_pcma2:
         type: org.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_pcma2:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_2:
+      network.incoming.packets_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_3:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pcm_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.incoming.bytes_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_pcma2:
+      disk.read.bytes_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_2:
-        type: tosca.capabilities.Attachment
+      feature_pcm_port_3_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcma1:
+      disk.read.bytes_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_3:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_pcma2:
+      cpu_util_server_pcma1:
         type: org.openecomp.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_pcma1:
+      cpu_util_server_pcma2:
         type: org.openecomp.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_pcma2:
+      network.outgoing.packets.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcma1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_3_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcma1:
-        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_pcma2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcma2:
+      network.incoming.packets.rate_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcma1:
+      memory.usage_server_pcma2:
         type: org.openecomp.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_pcma2:
+      memory.usage_server_pcma1:
         type: org.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_pcma1:
-        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_pcma1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcma2:
+      network.outgoing.bytes_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcma2:
-        type: tosca.capabilities.Node
+      binding_pcm_port_0_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      memory.usage_server_pcma2:
+      disk.read.bytes.rate_server_pcma1:
         type: org.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_pcma1:
+      disk.device.read.bytes_server_pcma2:
         type: org.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_pcma1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_pcma1:
+      disk.device.read.bytes_server_pcma1:
         type: org.openecomp.capabilities.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_pcma2:
+      network.outpoing.packets_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcma1:
+      network.outgoing.bytes_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -659,6 +619,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_2_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -695,6 +667,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pcm_port_3_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       scalable_server_pcma2:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -705,6 +683,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pcm_port_2_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_port_2_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests_server_pcma1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -741,83 +730,100 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pcm_port_2_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_pcma1:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pcm_port_1_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_pcma2:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcma1:
+      network.incoming.packets.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcma2:
+      binding_pcm_port_3_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcma1:
+      network.incoming.bytes.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcma2:
+      network.outgoing.bytes.rate_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      disk.capacity_server_pcma1:
         type: org.openecomp.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_pcm_port_0:
+      disk.capacity_server_pcma2:
         type: org.openecomp.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_pcm_port_2:
+      network.incoming.packets_pcm_port_2_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.write.requests_server_pcma1:
         type: org.openecomp.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_pcm_port_3:
+      disk.write.requests_server_pcma2:
         type: org.openecomp.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_pcma2:
+      network.incoming.bytes_pcm_port_3_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_1_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_3:
+      disk.usage_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -841,12 +847,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       vcpus_server_pcma2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -859,65 +859,65 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcma2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_1_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcma1:
+      disk.device.write.bytes_server_pcma2:
         type: org.openecomp.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_pcma2:
+      disk.allocation_server_pcma1:
         type: org.openecomp.capabilities.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_pcma1:
+      network.incoming.packets.rate_pcm_port_1_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcma1:
+      disk.allocation_server_pcma2:
         type: org.openecomp.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_pcm_port_0:
+      disk.device.write.bytes_server_pcma1:
         type: org.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_pcma2:
+      network.outgoing.packets.rate_pcm_port_0_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_3:
+      cpu_server_pcma1:
         type: org.openecomp.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_pcm_port_2:
+      cpu_server_pcma2:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcm_port_2_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
   org.openecomp.resource.abstract.nodes.pcma_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
@@ -2660,11 +2660,11 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
+      port_pcm_port_1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
+      port_pcm_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
@@ -2678,18 +2678,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_1_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_1_security_groups:
+          type: json
+      port_pcm_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_pcma_server_config_drive:
         type: list
         required: true
@@ -2738,16 +2738,16 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_pcm_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       port_pcm_port_1_order:
         type: integer
         required: true
@@ -5392,50 +5392,50 @@ node_types:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_dependsOn_network:
+    - dependency_jsa_security_group_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_jsa_security_group:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - port_jsa_security_group:
+    - port_jsa_security_group_1:
         capability: tosca.capabilities.Attachment
         node: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
         relationship: org.openecomp.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    capabilities:
-      end_point_dependsOn_network:
-        type: tosca.capabilities.Endpoint
+    - dependency_dependsOn_network_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      link_dependsOn_network:
-        type: tosca.capabilities.network.Linkable
+    capabilities:
+      feature_jsa_security_group_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group:
+      feature_dependsOn_network_0:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_dependsOn_network:
-        type: tosca.capabilities.Node
+      link_dependsOn_network_0:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_dependsOn_network:
+      attachment_dependsOn_network_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
+      end_point_dependsOn_network_0:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index 15a079d..14cf9ce 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -102,11 +102,11 @@ topology_template:
           - 0
         cps_net_name: nested_network
       requirements:
-      - link_pcm_port_2:
+      - link_pcm_port_2_0:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
-      - link_pcm_port_0:
+      - link_pcm_port_0_0:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -686,19 +686,19 @@ topology_template:
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_0_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_3_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_2
+          capability: attachment_pcm_port_2_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_3
+          capability: attachment_pcm_port_1_0
           node: nestedNoNestedSingleComputePattern
           relationship: org.openecomp.relationships.AttachesTo
     abstract_b_single_1b_1:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
index 41bef51..4a2f034 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
@@ -441,4 +441,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
index 0079f2a..0e25828 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -55,10 +55,10 @@ topology_template:
     port_pcm_port_0_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_exCP_naming:
+    port_pcm_port_1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pcm_port_1_exCP_naming:
+    port_pcm_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_pcm_port_1_network_role:
@@ -69,16 +69,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_ip_requirements:
+    port_pcm_port_1_security_groups:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_1_security_groups:
+        type: json
+    port_pcm_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_pcma_server_config_drive:
       type: list
       required: true
@@ -119,14 +119,14 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pcm_port_1_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     port_pcm_port_1_order:
       type: integer
       required: true
@@ -432,4 +432,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
index 23bca38..6dcce5e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml
@@ -17,12 +17,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    dependsOn_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: net_name
-    jsa_security_group:
+    jsa_security_group_1:
       type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
       properties:
         name:
@@ -93,6 +88,11 @@ topology_template:
           ethertype: IPv6
           remote_ip_prefix: ::/0
           direction: ingress
+    dependsOn_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: net_name
   groups:
     nested-no-nova_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -100,36 +100,36 @@ topology_template:
         heat_file: ../Artifacts/nested-no-nova.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - dependsOn_network
-      - jsa_security_group
+      - jsa_security_group_1
+      - dependsOn_network_0
   outputs:
     output1:
       value: myOutput
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova
     capabilities:
-      end_point_dependsOn_network:
-      - dependsOn_network
-      - end_point
-      link_dependsOn_network:
-      - dependsOn_network
-      - link
-      feature_jsa_security_group:
-      - jsa_security_group
+      feature_jsa_security_group_1:
+      - jsa_security_group_1
       - feature
-      feature_dependsOn_network:
-      - dependsOn_network
+      feature_dependsOn_network_0:
+      - dependsOn_network_0
       - feature
-      attachment_dependsOn_network:
-      - dependsOn_network
+      link_dependsOn_network_0:
+      - dependsOn_network_0
+      - link
+      attachment_dependsOn_network_0:
+      - dependsOn_network_0
       - attachment
+      end_point_dependsOn_network_0:
+      - dependsOn_network_0
+      - end_point
     requirements:
-      dependency_dependsOn_network:
-      - dependsOn_network
+      dependency_dependsOn_network_0:
+      - dependsOn_network_0
       - dependency
-      port_jsa_security_group:
-      - jsa_security_group
+      port_jsa_security_group_1:
+      - jsa_security_group_1
       - port
-      dependency_jsa_security_group:
-      - jsa_security_group
-      - dependency
+      dependency_jsa_security_group_1:
+      - jsa_security_group_1
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 676798e..c668697 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -108,7 +108,7 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: cps
+        port_pcm_port_1_network_role_tag: oam
         port_pcm_port_0_fixed_ips:
         - ip_address:
             get_input: cps_net_ip
@@ -123,14 +123,14 @@ topology_template:
         port_pcm_port_0_network_role_tag: cps
         port_pcm_port_1_network:
         - get_input: oam_net_name
+        port_pcm_port_1_security_groups:
+        - - get_input: security_group_name
         port_pcm_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_1_security_groups:
-        - - get_input: security_group_name
         compute_pcma_server_config_drive:
         - true
         compute_pcma_server_user_data_format:
@@ -145,15 +145,15 @@ topology_template:
             get_input: oam_net_ip
         compute_pcma_server_name:
         - get_input: pcma_server_name
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         port_pcm_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        port_pcm_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml
           count: 1
@@ -192,7 +192,7 @@ topology_template:
         port_pcm_port_2_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_3_network_role_tag: cps
+        port_pcm_port_3_network_role_tag: oam
         compute_pcma_server_config_drive:
         - true
         port_pcm_port_3_fixed_ips:
@@ -235,40 +235,25 @@ topology_template:
       - abstract_pcma_server_1
   outputs:
     portId:
-      value: pcm_port_3
+      value: pcm_port_3_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_0
-      network.incoming.packets.rate_pcm_port_3:
+      network.outpoing.packets_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_3
-      network.incoming.packets.rate_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.packets.rate_pcma_server_pcm_port_2
-      network.incoming.packets.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.packets.rate_pcma_server_pcm_port_1
-      network.outpoing.packets_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_1
+      - network.outpoing.packets_pcma_server_pcm_port_2
       disk.device.iops_server_pcma2:
       - abstract_pcma_server
       - disk.device.iops_pcma_server
-      network.outpoing.packets_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outpoing.packets_pcma_server_pcm_port_0
-      network.outpoing.packets_pcm_port_3:
-      - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_3
-      network.outpoing.packets_pcm_port_2:
-      - abstract_pcma_server
-      - network.outpoing.packets_pcma_server_pcm_port_2
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_1
       disk.device.iops_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.iops_pcma_server
+      network.incoming.bytes.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes.rate_pcma_server_pcm_port_0
       disk.device.capacity_server_pcma2:
       - abstract_pcma_server
       - disk.device.capacity_pcma_server
@@ -284,6 +269,12 @@ topology_template:
       disk.write.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.requests.rate_pcma_server
+      network.incoming.packets_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets_pcma_server_pcm_port_1
+      network.incoming.bytes_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes_pcma_server_pcm_port_0
       disk.write.requests.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.requests.rate_pcma_server
@@ -296,144 +287,111 @@ topology_template:
       disk.device.read.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.bytes.rate_pcma_server
-      network.outgoing.bytes_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_3
+      feature_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - feature_pcma_server_pcm_port_0
       disk.device.read.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.bytes.rate_pcma_server
-      binding_pcm_port_3:
-      - abstract_pcma_server
-      - binding_pcma_server_pcm_port_3
       disk.device.latency_server_pcma2:
       - abstract_pcma_server
       - disk.device.latency_pcma_server
       disk.device.usage_server_pcma2:
       - abstract_pcma_server
       - disk.device.usage_pcma_server
-      network.incoming.bytes_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_0
       disk.device.latency_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.latency_pcma_server
-      network.incoming.bytes_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_2
-      network.incoming.bytes_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.bytes_pcma_server_pcm_port_1
       disk.device.usage_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.usage_pcma_server
-      binding_pcm_port_0:
-      - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_0
-      binding_pcm_port_1:
-      - abstract_pcma_server_1
-      - binding_pcma_server_pcm_port_1
-      binding_pcm_port_2:
-      - abstract_pcma_server
-      - binding_pcma_server_pcm_port_2
-      network.incoming.bytes_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.bytes_pcma_server_pcm_port_3
-      network.outgoing.packets.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_3
       disk.device.read.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.requests_pcma_server
+      network.outgoing.packets.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outgoing.packets.rate_pcma_server_pcm_port_3
       disk.device.read.requests_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.requests_pcma_server
-      network.outgoing.packets.rate_pcm_port_0:
+      attachment_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_0
-      network.outgoing.packets.rate_pcm_port_1:
+      - attachment_pcma_server_pcm_port_0
+      network.incoming.packets.rate_pcm_port_0_0:
       - abstract_pcma_server_1
-      - network.outgoing.packets.rate_pcma_server_pcm_port_1
+      - network.incoming.packets.rate_pcma_server_pcm_port_0
       disk.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes_pcma_server
       disk.device.read.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.requests.rate_pcma_server
-      network.outgoing.packets.rate_pcm_port_2:
-      - abstract_pcma_server
-      - network.outgoing.packets.rate_pcma_server_pcm_port_2
       disk.device.read.requests.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.read.requests.rate_pcma_server
       disk.write.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.bytes_pcma_server
-      feature_pcm_port_1:
-      - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_1
       binding_server_pcma1:
       - abstract_pcma_server_1
       - binding_pcma_server
-      network.outgoing.bytes_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_0
       binding_server_pcma2:
       - abstract_pcma_server
       - binding_pcma_server
-      feature_pcm_port_0:
-      - abstract_pcma_server_1
-      - feature_pcma_server_pcm_port_0
-      network.outgoing.bytes_pcm_port_2:
-      - abstract_pcma_server
-      - network.outgoing.bytes_pcma_server_pcm_port_2
-      feature_pcm_port_3:
+      network.outgoing.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - feature_pcma_server_pcm_port_3
-      feature_pcm_port_2:
-      - abstract_pcma_server
-      - feature_pcma_server_pcm_port_2
-      network.outgoing.bytes_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes_pcma_server_pcm_port_1
-      attachment_pcm_port_0:
-      - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_0
-      attachment_pcm_port_1:
+      - network.outgoing.bytes_pcma_server_pcm_port_3
+      binding_pcm_port_1_0:
       - abstract_pcma_server_1
-      - attachment_pcma_server_pcm_port_1
+      - binding_pcma_server_pcm_port_1
       disk.write.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.write.bytes.rate_pcma_server
-      attachment_pcm_port_2:
-      - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_2
       disk.write.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.bytes.rate_pcma_server
-      attachment_pcm_port_3:
-      - abstract_pcma_server
-      - attachment_pcma_server_pcm_port_3
       disk.root.size_server_pcma2:
       - abstract_pcma_server
       - disk.root.size_pcma_server
       disk.root.size_server_pcma1:
       - abstract_pcma_server_1
       - disk.root.size_pcma_server
+      network.outgoing.bytes_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes_pcma_server_pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_0
+      network.outpoing.packets_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outpoing.packets_pcma_server_pcm_port_3
       disk.iops_server_pcma2:
       - abstract_pcma_server
       - disk.iops_pcma_server
       disk.iops_server_pcma1:
       - abstract_pcma_server_1
       - disk.iops_pcma_server
+      network.incoming.bytes.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.bytes.rate_pcma_server_pcm_port_3
       disk.device.write.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.bytes.rate_pcma_server
       disk.device.write.bytes.rate_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.bytes.rate_pcma_server
+      network.incoming.packets_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets_pcma_server_pcm_port_0
+      network.incoming.bytes_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes_pcma_server_pcm_port_1
       disk.read.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes_pcma_server
+      feature_pcm_port_3_0:
+      - abstract_pcma_server
+      - feature_pcma_server_pcm_port_3
       disk.read.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.read.bytes_pcma_server
@@ -443,9 +401,18 @@ topology_template:
       cpu_util_server_pcma2:
       - abstract_pcma_server
       - cpu_util_pcma_server
+      network.outgoing.packets.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.packets.rate_pcma_server_pcm_port_2
+      attachment_pcm_port_3_0:
+      - abstract_pcma_server
+      - attachment_pcma_server_pcm_port_3
       feature_server_pcma2:
       - abstract_pcma_server
       - feature_pcma_server
+      network.incoming.packets.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.packets.rate_pcma_server_pcm_port_3
       memory.usage_server_pcma2:
       - abstract_pcma_server
       - memory.usage_pcma_server
@@ -455,6 +422,12 @@ topology_template:
       feature_server_pcma1:
       - abstract_pcma_server_1
       - feature_pcma_server
+      network.outgoing.bytes_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes_pcma_server_pcm_port_2
+      binding_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - binding_pcma_server_pcm_port_0
       disk.read.bytes.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.read.bytes.rate_pcma_server
@@ -464,6 +437,12 @@ topology_template:
       disk.device.read.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.read.bytes_pcma_server
+      network.outpoing.packets_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outpoing.packets_pcma_server_pcm_port_0
+      network.outgoing.bytes_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.bytes_pcma_server_pcm_port_0
       endpoint_server_pcma2:
       - abstract_pcma_server
       - endpoint_pcma_server
@@ -485,6 +464,12 @@ topology_template:
       host_server_pcma1:
       - abstract_pcma_server_1
       - host_pcma_server
+      network.incoming.bytes.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.bytes.rate_pcma_server_pcm_port_2
+      network.outgoing.bytes.rate_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_3
       disk.ephemeral.size_server_pcma1:
       - abstract_pcma_server_1
       - disk.ephemeral.size_pcma_server
@@ -503,12 +488,21 @@ topology_template:
       disk.device.write.requests.rate_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.requests.rate_pcma_server
+      network.incoming.packets_pcm_port_3_0:
+      - abstract_pcma_server
+      - network.incoming.packets_pcma_server_pcm_port_3
       scalable_server_pcma2:
       - abstract_pcma_server
       - scalable_pcma_server
       scalable_server_pcma1:
       - abstract_pcma_server_1
       - scalable_pcma_server
+      network.incoming.bytes_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.bytes_pcma_server_pcm_port_2
+      feature_pcm_port_2_0:
+      - abstract_pcma_server
+      - feature_pcma_server_pcm_port_2
       disk.device.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.requests_pcma_server
@@ -527,48 +521,57 @@ topology_template:
       instance_server_pcma1:
       - abstract_pcma_server_1
       - instance_pcma_server
+      attachment_pcm_port_2_0:
+      - abstract_pcma_server
+      - attachment_pcma_server_pcm_port_2
       os_server_pcma1:
       - abstract_pcma_server_1
       - os_pcma_server
+      network.outgoing.packets.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outgoing.packets.rate_pcma_server_pcm_port_1
       os_server_pcma2:
       - abstract_pcma_server
       - os_pcma_server
+      network.incoming.packets.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.packets.rate_pcma_server_pcm_port_2
+      binding_pcm_port_3_0:
+      - abstract_pcma_server
+      - binding_pcma_server_pcm_port_3
+      network.outpoing.packets_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.outpoing.packets_pcma_server_pcm_port_1
+      network.incoming.bytes.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.bytes.rate_pcma_server_pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.outgoing.bytes.rate_pcma_server_pcm_port_2
       disk.capacity_server_pcma1:
       - abstract_pcma_server_1
       - disk.capacity_pcma_server
       disk.capacity_server_pcma2:
       - abstract_pcma_server
       - disk.capacity_pcma_server
+      network.incoming.packets_pcm_port_2_0:
+      - abstract_pcma_server
+      - network.incoming.packets_pcma_server_pcm_port_2
       disk.write.requests_server_pcma1:
       - abstract_pcma_server_1
       - disk.write.requests_pcma_server
       disk.write.requests_server_pcma2:
       - abstract_pcma_server
       - disk.write.requests_pcma_server
-      network.outgoing.bytes.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_1
-      network.incoming.packets_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_0
-      network.outgoing.bytes.rate_pcm_port_2:
+      network.incoming.bytes_pcm_port_3_0:
       - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_2
-      network.outgoing.bytes.rate_pcm_port_0:
+      - network.incoming.bytes_pcma_server_pcm_port_3
+      feature_pcm_port_1_0:
       - abstract_pcma_server_1
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_0
-      network.incoming.packets_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_3
+      - feature_pcma_server_pcm_port_1
       disk.usage_server_pcma2:
       - abstract_pcma_server
       - disk.usage_pcma_server
-      network.incoming.packets_pcm_port_2:
-      - abstract_pcma_server
-      - network.incoming.packets_pcma_server_pcm_port_2
-      network.outgoing.bytes.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.outgoing.bytes.rate_pcma_server_pcm_port_3
       disk.usage_server_pcma1:
       - abstract_pcma_server_1
       - disk.usage_pcma_server
@@ -578,45 +581,42 @@ topology_template:
       memory.resident_server_pcma1:
       - abstract_pcma_server_1
       - memory.resident_pcma_server
-      network.incoming.packets_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.packets_pcma_server_pcm_port_1
       vcpus_server_pcma2:
       - abstract_pcma_server
       - vcpus_pcma_server
       memory.resident_server_pcma2:
       - abstract_pcma_server
       - memory.resident_pcma_server
+      attachment_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - attachment_pcma_server_pcm_port_1
       disk.device.write.bytes_server_pcma2:
       - abstract_pcma_server
       - disk.device.write.bytes_pcma_server
       disk.allocation_server_pcma1:
       - abstract_pcma_server_1
       - disk.allocation_pcma_server
+      network.incoming.packets.rate_pcm_port_1_0:
+      - abstract_pcma_server_1
+      - network.incoming.packets.rate_pcma_server_pcm_port_1
       disk.allocation_server_pcma2:
       - abstract_pcma_server
       - disk.allocation_pcma_server
       disk.device.write.bytes_server_pcma1:
       - abstract_pcma_server_1
       - disk.device.write.bytes_pcma_server
+      network.outgoing.packets.rate_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - network.outgoing.packets.rate_pcma_server_pcm_port_0
       cpu_server_pcma1:
       - abstract_pcma_server_1
       - cpu_pcma_server
-      network.incoming.bytes.rate_pcm_port_0:
-      - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_0
       cpu_server_pcma2:
       - abstract_pcma_server
       - cpu_pcma_server
-      network.incoming.bytes.rate_pcm_port_3:
-      - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_3
-      network.incoming.bytes.rate_pcm_port_2:
+      binding_pcm_port_2_0:
       - abstract_pcma_server
-      - network.incoming.bytes.rate_pcma_server_pcm_port_2
-      network.incoming.bytes.rate_pcm_port_1:
-      - abstract_pcma_server_1
-      - network.incoming.bytes.rate_pcma_server_pcm_port_1
+      - binding_pcma_server_pcm_port_2
     requirements:
       dependency_server_pcma2:
       - abstract_pcma_server
@@ -624,33 +624,33 @@ topology_template:
       local_storage_server_pcma2:
       - abstract_pcma_server
       - local_storage_pcma_server
-      link_pcm_port_0:
-      - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_0
-      link_pcm_port_1:
-      - abstract_pcma_server_1
-      - link_pcma_server_pcm_port_1
       dependency_server_pcma1:
       - abstract_pcma_server_1
       - dependency_pcma_server
       local_storage_server_pcma1:
       - abstract_pcma_server_1
       - local_storage_pcma_server
-      link_pcm_port_2:
+      dependency_pcm_port_3_0:
       - abstract_pcma_server
-      - link_pcma_server_pcm_port_2
-      link_pcm_port_3:
-      - abstract_pcma_server
-      - link_pcma_server_pcm_port_3
-      dependency_pcm_port_0:
+      - dependency_pcma_server_pcm_port_3
+      link_pcm_port_1_0:
       - abstract_pcma_server_1
-      - dependency_pcma_server_pcm_port_0
-      dependency_pcm_port_3:
+      - link_pcma_server_pcm_port_1
+      dependency_pcm_port_2_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_3
-      dependency_pcm_port_1:
+      - dependency_pcma_server_pcm_port_2
+      link_pcm_port_2_0:
+      - abstract_pcma_server
+      - link_pcma_server_pcm_port_2
+      dependency_pcm_port_1_0:
       - abstract_pcma_server_1
       - dependency_pcma_server_pcm_port_1
-      dependency_pcm_port_2:
+      dependency_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - dependency_pcma_server_pcm_port_0
+      link_pcm_port_0_0:
+      - abstract_pcma_server_1
+      - link_pcma_server_pcm_port_0
+      link_pcm_port_3_0:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
+      - link_pcma_server_pcm_port_3
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
index b269546..887ff6a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/in/nested-pcm_v0.1.yaml
@@ -68,15 +68,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -84,7 +84,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 14b52bc..49ac208 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1493,43 +1493,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1543,33 +1541,29 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      server_group:
+      port_pcm_port_00_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_00_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      server_group:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1585,36 +1579,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1630,8 +1630,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1640,14 +1640,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1667,57 +1667,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_pcm:
+      disk.write.requests_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1741,150 +1739,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      disk.root.size_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1893,6 +1873,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1946,61 +1932,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      cpu.delta_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2035,7 +2035,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2047,7 +2047,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5375,4 +5375,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 6f11bd9..e4577fe 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -222,32 +222,31 @@ topology_template:
       directives:
       - substitutable
       properties:
-        server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_00_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        server_group: BE_Affinity_group
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -255,8 +254,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -656,11 +656,11 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -844,4 +844,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 198b4c8..293a19f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,30 +57,27 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    server_group:
-      hidden: false
-      immutable: false
+    port_pcm_port_00_network_role:
       type: string
-    port_pcm_port_0_ip_requirements:
+      required: true
+    port_pcm_port_00_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    server_group:
+      hidden: false
+      immutable: false
+      type: string
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -100,34 +96,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -146,36 +146,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -197,32 +197,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -235,9 +235,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -245,27 +245,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -275,18 +275,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -296,21 +314,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -323,36 +335,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -380,36 +374,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -425,31 +425,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
index b6b8578..b08c486 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/in/nested-pcm_v0.1.yaml
@@ -71,15 +71,15 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
       scheduler_hints: { group: { get_param: server_group }  }
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -87,7 +87,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 40d6c55..963fe97 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1366,43 +1366,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1416,23 +1414,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -1441,12 +1441,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -1462,36 +1456,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -1507,8 +1507,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -1517,14 +1517,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1544,57 +1544,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_pcm:
+      disk.write.requests_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1618,150 +1616,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      disk.root.size_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1770,6 +1750,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1823,61 +1809,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      cpu.delta_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1912,7 +1912,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1924,7 +1924,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2944,43 +2944,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
+      availabilityzone_name:
         type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_00_subnetpoolid:
         type: string
-        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -2994,23 +2992,25 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      oam_net_name:
+        type: string
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pcm_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      oam_net_name:
+      port_pcm_port_00_network_role:
         type: string
-        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
-        type: string
+      port_pcm_port_00_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       server_group:
         type: string
         required: true
@@ -3019,12 +3019,6 @@ node_types:
         type: json
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -3040,36 +3034,42 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -3085,8 +3085,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -3095,14 +3095,14 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3122,57 +3122,55 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      cpu_server_pcm:
         type: org.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      memory_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.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_pcm:
+      disk.write.requests_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3196,150 +3194,132 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.allocation_server_pcm:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      disk.usage_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      disk.device.write.bytes_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_00:
         type: org.openecomp.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_pcm:
+      disk.root.size_server_pcm:
         type: org.openecomp.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_pcm:
+      disk.ephemeral.size_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      disk.device.latency_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.requests_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.bytes_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_pcm_port_00:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3348,6 +3328,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3401,61 +3387,75 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      binding_pcm_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.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_pcm:
+      cpu.delta_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3490,7 +3490,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3502,7 +3502,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8354,4 +8354,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index b9c3a5f..4c55b81 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -1072,19 +1072,19 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested_1
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested_1
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_0
+          capability: attachment_pcm_port_00
           node: 4p_nested_2
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_pcm_port_1
+          capability: attachment_pcm_port_01
           node: 4p_nested_2
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1437,8 +1437,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo1C1_T1_02:
             get_attribute:
@@ -1508,30 +1513,24 @@ topology_template:
             get_attribute:
             - 1c201_catalog_instance_1C22
             - instance_name
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -1539,8 +1538,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -1570,8 +1570,13 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_pcm_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         server_group: BE_Affinity_group
-        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo4PNested_2:
             get_attribute:
@@ -1641,30 +1646,24 @@ topology_template:
             get_attribute:
             - 1c201_catalog_instance_1C22
             - instance_name
-        port_pcm_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        security_group_name: jsa_security_group
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_00_mac_requirements:
           mac_count_required:
             is_required: false
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_ip_requirements:
+        security_group_name: jsa_security_group
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_00_network_role_tag: cps
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
@@ -1672,8 +1671,9 @@ topology_template:
           - pcm_server_names
           - 0
         cps_net_name: nested_network
+        port_pcm_port_01_network_role_tag: oam
       requirements:
-      - link_pcm_port_0:
+      - link_pcm_port_00:
           capability: tosca.capabilities.network.Linkable
           node: nested_network
           relationship: tosca.relationships.network.LinksTo
@@ -1950,4 +1950,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index a4746fc..2a2b7dc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,21 +57,23 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
+      type: string
+      required: true
+    port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     server_group:
       hidden: false
       immutable: false
@@ -81,11 +82,6 @@ topology_template:
       hidden: false
       immutable: false
       type: json
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -104,34 +100,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -150,36 +150,36 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -201,32 +201,32 @@ topology_template:
         scheduler_hints:
           group:
             get_input: server_group
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -239,9 +239,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
+      - pcm_port_00
       - server_pcm
-      - pcm_port_0
+      - pcm_port_01
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -249,27 +249,27 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
       memory_server_pcm:
       - server_pcm
       - memory
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -279,18 +279,36 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
@@ -300,21 +318,15 @@ topology_template:
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -327,36 +339,18 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
@@ -384,36 +378,42 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
       host_server_pcm:
       - server_pcm
       - host
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes.rate
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -429,31 +429,31 @@ topology_template:
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml
index e138b3d..8dc7b43 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/main.yml
@@ -119,14 +119,14 @@ resources:
 
   ########### PATTERN 1C1 #################
 
-  cmaui_port_1:
+  cmaui_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: contrail_net_name}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_02:
     type: OS::Neutron::Port
     properties:
       network: { get_param: contrail_net_name}
@@ -145,7 +145,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_main_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_port_01 }
 
   server_main_1c1_cmaui_2:
     type: OS::Nova::Server
@@ -159,7 +159,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_main_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_port_02 }
 
   ########### PATTERN 4 #################
 

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml
index a90a5ca..d957b39 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4-same-type.yml
@@ -48,7 +48,7 @@ resources:
       fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 1]}}]
       replacement_policy: AUTO
 
-  server_pd_pattern4:
+  server_pd_pattern4_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [pd_server_pattern4_names, 0]}
@@ -62,5 +62,5 @@ resources:
 outputs:
   pattern4_attr_1:
     description: pattern4_attr_1_value
-    value: { get_resource: server_pd_pattern4 }
+    value: { get_resource: server_pd_pattern4_1 }
 

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml
index a90a5ca..68c93f5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested-pattern-4.yml
@@ -34,14 +34,14 @@ parameters:
     type: string
 resources:
 
-  pd_server_pattern4_port_1:
+  pd_server_pattern4_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
       fixed_ips: [{"ip_address": {get_param: [pd_server_pattern4_ips, 0]}}]
       replacement_policy: AUTO
 
-  pd_server_pattern4_port_2:
+  pd_server_pattern4_port_02:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -56,8 +56,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_pattern4_flavor }
       networks:
-      - port: { get_resource: pd_server_pattern4_port_1 }
-      - port: { get_resource: pd_server_pattern4_port_2 }
+      - port: { get_resource: pd_server_pattern4_port_01 }
+      - port: { get_resource: pd_server_pattern4_port_02 }
 
 outputs:
   pattern4_attr_1:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml
index 9b397c6..59312c6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in/nested1.yml
@@ -67,21 +67,21 @@ resources:
 
   ########### PATTERN 1B (same type as main) ##################
 
-  pd_server_main_1b_port:
+  pd_server_main_1b_port_1:
     type: OS::Neutron::Port
     properties:
       network: { get_param: jsa_name }
       fixed_ips: [{"ip_address": {get_param: [pd_server_main_1b_ips, 0]}}]
       replacement_policy: AUTO
 
-  ps_server_main_1b_port:
+  ps_server_main_1b_port_1:
     type: OS::Neutron::Port
     properties:
       network: { get_param: jsa_name }
       fixed_ips: [{"ip_address": {get_param: [ps_server_main_1b_ips, 0]}}]
       replacement_policy: AUTO
 
-  server_main_pd_1b:
+  server_main_pd_1b_1:
     type: OS::Nova::Server
     depends_on:
       - test_nested2Level
@@ -91,41 +91,41 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_main_1b_flavor }
       networks:
-      - port: { get_resource: pd_server_main_1b_port }
+      - port: { get_resource: pd_server_main_1b_port_1 }
 
-  server_main_ps_1b:
+  server_main_ps_1b_1:
     type: OS::Nova::Server
     depends_on:
-      - server_main_pd_1b
+      - server_main_pd_1b_1
     properties:
       name: { get_param: [ps_server_main_1b_names, 1]}
       image: { get_param: ps_server_main_1b_image }
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: ps_server_main_1b_flavor }
       networks:
-      - port: { get_resource: ps_server_main_1b_port }
+      - port: { get_resource: ps_server_main_1b_port_1 }
 
   ########### PATTERN 1C1 (same type as main) #################
 
-  cmaui_port_1:
+  cmaui_port_11:
     type: OS::Neutron::Port
     properties:
       network: { get_param: contrail_net_name}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_12:
     type: OS::Neutron::Port
     properties:
       network: { get_param: contrail_net_name}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  server_main_1c1_cmaui_1:
+  server_main_1c1_cmaui_11:
     type: OS::Nova::Server
     depends_on:
-      - server_main_pd_1b
-      - server_main_ps_1b
+      - server_main_pd_1b_1
+      - server_main_ps_1b_1
       - test_nested2Level
     properties:
       name: { get_param: [cmaui_1c1_main_names, 0]}
@@ -133,13 +133,13 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_main_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_port_11 }
 
-  server_main_1c1_cmaui_2:
+  server_main_1c1_cmaui_21:
     type: OS::Nova::Server
     depends_on:
-      - server_main_pd_1b
-      - server_main_ps_1b
+      - server_main_pd_1b_1
+      - server_main_ps_1b_1
       - test_nested2Level
     properties:
       name: { get_param: [cmaui_1c1_main_names, 1]}
@@ -147,16 +147,16 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_1c1_main_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_port_12 }
 
   ########### PATTERN 4 (same type as main) #################
 
   test_nested_pattern_4_main_1:
     type: nested-pattern-4.yml
     depends_on:
-      - server_main_1c1_cmaui_1
-      - server_main_1c1_cmaui_2
-      - server_main_pd_1b
-      - server_main_ps_1b
+      - server_main_1c1_cmaui_11
+      - server_main_1c1_cmaui_21
+      - server_main_pd_1b_1
+      - server_main_ps_1b_1
     properties:
       p1: { get_param: jsa_name}
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 32fbdf0..12d24c9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -749,33 +749,33 @@ node_types:
         description: pattern4_attr_1_value
         status: SUPPORTED
     requirements:
-    - dependency_server_pd_pattern4:
+    - dependency_pd_server_pattern4_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_pattern4:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_pattern4_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1:
+        - 1
+        - 1
+    - dependency_server_pd_pattern4_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_pattern4_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     - dependency_pd_server_pattern4_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -790,13 +790,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      disk.root.size_server_pd_pattern4:
-        type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.ephemeral.size_server_pd_pattern4_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:
@@ -808,13 +802,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_pattern4:
-        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_pd_pattern4_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pd_pattern4:
+      memory.usage_server_pd_pattern4_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:
@@ -826,25 +819,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd_pattern4:
-        type: org.openecomp.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_pd_pattern4:
+      disk.device.capacity_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pd_pattern4:
+      disk.write.bytes.rate_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pd_pattern4:
+      disk.device.iops_server_pd_pattern4_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:
@@ -860,141 +847,136 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pd_pattern4:
+      disk.device.latency_server_pd_pattern4_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
-      endpoint_server_pd_pattern4:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.write.requests_server_pd_pattern4_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests.rate_server_pd_pattern4_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_1:
+      attachment_pd_server_pattern4_port_2:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pd_pattern4:
-        type: tosca.capabilities.Node
+      attachment_pd_server_pattern4_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd_pattern4:
+      cpu_util_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pd_pattern4:
+      memory_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pd_pattern4:
-        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_pd_pattern4_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pd_pattern4:
+      disk.latency_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd_pattern4:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_pd_pattern4:
+      disk.device.write.requests.rate_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4:
+      disk.allocation_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pd_pattern4:
+      disk.device.read.bytes.rate_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pd_pattern4:
+      disk.device.usage_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd_pattern4:
+      disk.read.bytes.rate_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_pattern4:
+      disk.device.write.bytes_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd_pattern4:
+      memory.resident_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pd_pattern4:
-        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_pd_pattern4_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_pd_pattern4:
+      disk.write.bytes_server_pd_pattern4_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_pd_pattern4:
+      network.outpoing.packets_pd_server_pattern4_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pd_pattern4:
+      network.outpoing.packets_pd_server_pattern4_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pd_pattern4:
-        type: tosca.capabilities.network.Bindable
+      feature_server_pd_pattern4_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1:
+      disk.device.write.requests_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_2:
+      disk.write.requests.rate_server_pd_pattern4_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:
@@ -1012,7 +994,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pd_pattern4:
+      disk.device.read.bytes_server_pd_pattern4_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:
@@ -1030,61 +1012,68 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4:
+      disk.read.bytes_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pd_pattern4:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
+      instance_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pd_pattern4:
+      vcpus_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd_pattern4:
+      cpu.delta_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pd_pattern4:
-        type: tosca.capabilities.OperatingSystem
+      binding_server_pd_pattern4_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_pattern4:
+      disk.device.read.requests_server_pd_pattern4_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd_pattern4:
+      disk.device.write.bytes.rate_server_pd_pattern4_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
-      scalable_server_pd_pattern4:
-        type: tosca.capabilities.Scalable
+      disk.usage_server_pd_pattern4_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_pd_pattern4_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
@@ -1095,19 +1084,18 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_pd_pattern4_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pd_pattern4:
+      network.incoming.bytes.rate_pd_server_pattern4_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_pattern4:
+      disk.iops_server_pd_pattern4_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:
@@ -1132,13 +1120,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_pattern4:
+      network.incoming.packets_pd_server_pattern4_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1:
+      disk.read.requests_server_pd_pattern4_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_pd_pattern4_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:
@@ -1156,7 +1150,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd_pattern4:
+      disk.capacity_server_pd_pattern4_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_server_pd_pattern4_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:
@@ -1179,65 +1179,65 @@ node_types:
         description: UID of OAM network
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_order:
-        type: integer
+      port_pd_server_pattern4_port_02_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_vlan_requirements:
-        type: list
+      port_pd_server_pattern4_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_server_pattern4_port_2_network_role_tag:
+      port_pd_server_pattern4_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_mac_requirements:
+      port_pd_server_pattern4_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      availability_zone_0:
-        type: string
-        description: availabilityzone name
+      port_pd_server_pattern4_port_02_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_ip_requirements:
+      port_pd_server_pattern4_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_vlan_requirements:
-        type: list
+      availability_zone_0:
+        type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       net:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role_tag:
-        type: string
+      port_pd_server_pattern4_port_02_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_02_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_server_pattern4_port_01_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_ip_requirements:
-        type: list
+      port_pd_server_pattern4_port_02_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_exCP_naming:
+      port_pd_server_pattern4_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
@@ -1253,7 +1253,7 @@ node_types:
         description: Flavor for PS server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_order:
+      port_pd_server_pattern4_port_01_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -1262,23 +1262,23 @@ node_types:
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role:
-        type: string
+      port_pd_server_pattern4_port_02_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_server_pattern4_port_02_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_server_pattern4_port_1_subnetpoolid:
-        type: string
+      port_pd_server_pattern4_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -1295,6 +1295,19 @@ node_types:
         description: pattern4_attr_1_value
         status: SUPPORTED
     requirements:
+    - dependency_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_server_pd_pattern4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1309,64 +1322,80 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1:
+    - dependency_pd_server_pattern4_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1:
+    - link_pd_server_pattern4_port_02:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      disk.root.size_server_pd_pattern4:
+        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
-    - link_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+      disk.device.write.bytes_server_pd_pattern4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - 1
-    capabilities:
-      disk.root.size_server_pd_pattern4:
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      binding_pd_server_pattern4_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.incoming.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      feature_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.allocation_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      disk.device.usage_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1396,15 +1425,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Node
+      binding_pd_server_pattern4_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.latency_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1417,16 +1443,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_server_pd_pattern4:
         type: tosca.capabilities.Node
         occurrences:
@@ -1456,6 +1472,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_pattern4_port_01:
+        type: org.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_pd_pattern4:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -1469,144 +1491,138 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4:
+      network.incoming.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_pattern4:
+      memory.resident_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.requests_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      disk.write.requests_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.requests.rate_server_pd_pattern4:
         type: org.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_pd_pattern4:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1:
+      memory.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      vcpus_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      disk.capacity_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outpoing.packets_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      network.outpoing.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_pd_pattern4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4:
+      disk.device.iops_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.allocation_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
+      disk.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.bytes_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1634,14 +1650,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1659,44 +1668,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.write.requests_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1725,65 +1725,65 @@ node_types:
         description: UID of OAM network
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_order:
-        type: integer
+      port_pd_server_pattern4_port_02_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_vlan_requirements:
-        type: list
+      port_pd_server_pattern4_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_server_pattern4_port_2_network_role_tag:
+      port_pd_server_pattern4_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_mac_requirements:
+      port_pd_server_pattern4_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      availability_zone_0:
-        type: string
-        description: availabilityzone name
+      port_pd_server_pattern4_port_02_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_ip_requirements:
+      port_pd_server_pattern4_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_vlan_requirements:
-        type: list
+      availability_zone_0:
+        type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       net:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role_tag:
-        type: string
+      port_pd_server_pattern4_port_02_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_server_pattern4_port_02_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_server_pattern4_port_01_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_ip_requirements:
-        type: list
+      port_pd_server_pattern4_port_02_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_exCP_naming:
+      port_pd_server_pattern4_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
@@ -1798,7 +1798,7 @@ node_types:
         description: Flavor for PS server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_order:
+      port_pd_server_pattern4_port_01_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -1807,23 +1807,23 @@ node_types:
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role:
-        type: string
+      port_pd_server_pattern4_port_02_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_server_pattern4_port_02_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_server_pattern4_port_1_subnetpoolid:
-        type: string
+      port_pd_server_pattern4_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -1839,6 +1839,19 @@ node_types:
         description: pattern4_attr_1_value
         status: SUPPORTED
     requirements:
+    - dependency_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_server_pd_pattern4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1853,64 +1866,80 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1:
+    - dependency_pd_server_pattern4_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1:
+    - link_pd_server_pattern4_port_02:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      disk.root.size_server_pd_pattern4:
+        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
-    - link_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+      disk.device.write.bytes_server_pd_pattern4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - 1
-    capabilities:
-      disk.root.size_server_pd_pattern4:
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      binding_pd_server_pattern4_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.incoming.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      feature_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.allocation_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      disk.device.usage_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1940,15 +1969,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Node
+      binding_pd_server_pattern4_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.latency_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1961,16 +1987,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_server_pd_pattern4:
         type: tosca.capabilities.Node
         occurrences:
@@ -2000,6 +2016,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_pattern4_port_01:
+        type: org.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_pd_pattern4:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -2013,144 +2035,138 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4:
+      network.incoming.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_pattern4:
+      memory.resident_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.requests_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      disk.write.requests_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.requests.rate_server_pd_pattern4:
         type: org.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_pd_pattern4:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1:
+      memory.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      vcpus_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      disk.capacity_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outpoing.packets_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      network.outpoing.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_pd_pattern4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4:
+      disk.device.iops_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.allocation_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
+      disk.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.bytes_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2178,14 +2194,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2203,44 +2212,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.write.requests_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        - 1
+        - UNBOUNDED
+      attachment_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2770,26 +2770,26 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_pd_server_main_1b_port:
+    - dependency_test_nested_pattern_4_main_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_main_1b_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested_pattern_4_main_1:
+    - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_server_pd_pattern4_test_nested_pattern_4_main_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -2804,114 +2804,113 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+    - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+    - link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+    - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+    - link_cmaui_port_12:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_11:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_main_1c1_cmaui_2:
+    - dependency_server_main_pd_1b_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_main_1c1_cmaui_2:
+    - local_storage_server_main_pd_1b_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_main_1c1_cmaui_1:
+    - dependency_server_main_1c1_cmaui_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_main_1c1_cmaui_1:
+    - local_storage_server_main_1c1_cmaui_11:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_ps_server_main_1b_port:
+    - dependency_ps_server_main_1b_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_ps_server_main_1b_port:
+    - link_ps_server_main_1b_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_main_pd_1b:
+    - dependency_server_main_1c1_cmaui_21:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_main_pd_1b:
+    - local_storage_server_main_1c1_cmaui_21:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_main_ps_1b:
+    - dependency_pd_server_main_1b_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_main_ps_1b:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_main_1b_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     - dependency_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3002,41 +3001,41 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+    - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+        - 1
+        - 1
+    - dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+        - 0
+        - UNBOUNDED
+    - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+    - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3111,33 +3110,33 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        - 1
+        - 1
+    - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3191,19 +3190,20 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_1:
+    - dependency_server_main_ps_1b_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_main_ps_1b_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
       feature_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: tosca.capabilities.Node
@@ -3216,17 +3216,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3239,30 +3228,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_main_pd_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-        type: org.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_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
@@ -3280,30 +3245,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.openecomp.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_main_pd_1b:
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_main_1c1_cmaui_2:
+      cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_main_pd_1b:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_main_1c1_cmaui_1:
+      disk.device.read.requests_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3321,39 +3275,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.openecomp.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_main_ps_1b:
+      disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_main_1c1_cmaui_11:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -3363,12 +3292,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.ephemeral.size_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3382,7 +3305,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.latency_server_main_ps_1b_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:
@@ -3393,45 +3316,44 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      disk.device.write.requests_server_nested2_1c1_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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      cpu_util_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_main_pd_1b:
+      disk.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.latency_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_main_pd_1b:
+      disk.device.write.requests_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.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_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.device.read.requests_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.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_nested2_ps_1b_test_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_main_1c1_cmaui_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3441,43 +3363,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_main_1c1_cmaui_1:
+      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_main_pd_1b:
+      disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_pd_1b_test_nested2Level:
+      network.incoming.bytes_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_main_1c1_cmaui_2:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_main_1c1_cmaui_1:
+      disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3501,19 +3422,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests_server_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_ps_server_main_1b_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_main_pd_1b:
+      vcpus_server_main_pd_1b_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:
@@ -3554,48 +3468,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_main_ps_1b:
-        type: tosca.capabilities.network.Bindable
+      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_main_1b_port:
+      disk.device.write.bytes.rate_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      instance_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.read.bytes.rate_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.read.bytes.rate_server_main_pd_1b_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:
@@ -3619,7 +3527,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_main_pd_1b:
+      network.outgoing.bytes.rate_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3643,7 +3551,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      network.outgoing.packets.rate_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3655,19 +3563,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_main_ps_1b:
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_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:
@@ -3696,7 +3603,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      instance_server_main_ps_1b_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:
@@ -3708,13 +3615,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3726,13 +3627,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_nested2_ps_1b_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      memory.usage_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3750,27 +3651,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_main_1c1_cmaui_1:
+      disk.allocation_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -3787,86 +3687,66 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.usage_server_main_1c1_cmaui_21:
         type: org.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_pd_pattern4_test_nested_pattern_4_main_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.write.requests_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      cpu_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group2_test_resourceGroup_test_nested2Level:
+      feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_main_pd_1b:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests_server_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests_server_main_1c1_cmaui_2:
+      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_main_1c1_cmaui_1:
-        type: tosca.capabilities.Node
+      host_server_main_pd_1b_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_main_1c1_cmaui_2:
+      feature_jsa_security_group2_test_resourceGroup_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
+      cpu.delta_server_main_ps_1b_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:
@@ -3877,31 +3757,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level:
+      cpu_util_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.bytes_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_1:
+      network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      disk.usage_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3913,48 +3787,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_main_pd_1b:
+      disk.device.write.bytes.rate_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_main_pd_1b:
+      cpu_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      cpu_server_nested2_ps_1b_test_nested2Level:
+      disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_main_1b_port:
-        type: tosca.capabilities.Attachment
+      binding_ps_server_main_1b_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_ps_server_main_1b_port:
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3966,60 +3842,76 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_nested2_ps_1b_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_12:
         type: org.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_ps_server_nested2_1b_port_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.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_main_ps_1b_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_main_pd_1b:
+      disk.device.read.bytes_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_main_1b_port:
+      attachment_ps_server_main_1b_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.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_main_pd_1b:
+      feature_ps_server_nested2_1b_port_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_main_1c1_cmaui_21:
         type: org.openecomp.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_nested2_pd_1b_test_nested2Level:
+      disk.write.bytes_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.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_ps_server_nested2_1b_port_test_nested2Level:
+      disk.device.read.bytes.rate_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.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_main_pd_1b:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4030,15 +3922,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-        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_main_1c1_cmaui_11:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -4048,7 +3933,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4066,19 +3951,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
+      feature_server_main_ps_1b_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_main_pd_1b:
+      disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4095,6 +3985,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.latency_server_main_1c1_cmaui_11:
+        type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4106,48 +4002,56 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
+      disk.device.write.bytes_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_main_1c1_cmaui_1:
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      disk.ephemeral.size_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.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_ps_server_main_1b_port:
+      disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Node
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.openecomp.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_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.iops_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4165,13 +4069,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_server_main_1b_port:
+      disk.device.read.bytes.rate_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_main_pd_1b:
+      disk.device.usage_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4183,13 +4087,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.bytes_server_nested2_1c1_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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.read.bytes.rate_server_main_1c1_cmaui_21:
         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,14 +4105,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.write.requests.rate_server_main_pd_1b_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
-      endpoint_server_main_pd_1b:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4218,6 +4123,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_ps_server_main_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_1_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4225,7 +4136,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.capacity_server_main_ps_1b:
+      disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4237,13 +4148,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
+      memory.usage_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pd_server_main_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.write.bytes.rate_server_nested2_1c1_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:
@@ -4255,6 +4184,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      scalable_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4267,26 +4201,44 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.iops_server_main_1c1_cmaui_11:
         type: org.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_main_1c1_cmaui_2:
+      os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
+        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
-      os_server_main_1c1_cmaui_1:
-        type: tosca.capabilities.OperatingSystem
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_main_1c1_cmaui_11:
+        type: org.openecomp.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_main_pd_1b_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
@@ -4302,19 +4254,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
+      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4332,6 +4284,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.write.requests_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4350,84 +4308,106 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.latency_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_nested2_pd_1b_test_nested2Level:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_main_pd_1b:
+      disk.read.bytes_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_main_1:
+      cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_main_ps_1b:
+      disk.device.write.requests.rate_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level:
+      disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.latency_server_nested2_1c1_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_main_pd_1b:
+      network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_1c1_cmaui_2_test_nested2Level:
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_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_ps_server_nested2_1b_port_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
+      endpoint_server_main_pd_1b_1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_server_main_1c1_cmaui_21:
+        type: org.openecomp.capabilities.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_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      network.outgoing.bytes_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4457,6 +4437,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4475,66 +4460,96 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_main_pd_1b:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_main_pd_1b:
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_nested2_pd_1b_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets.rate_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_nested2_pd_1b_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.openecomp.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_ps_server_main_1b_port:
+      disk.device.usage_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      disk.capacity_server_nested2_ps_1b_test_nested2Level:
         type: org.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_main_ps_1b:
+      binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      host_server_main_ps_1b_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_nested2_ps_1b_test_nested2Level:
+      memory.usage_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.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_ps_server_nested2_1b_port_test_nested2Level:
+      instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4545,61 +4560,60 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_main_pd_1b:
-        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_main_ps_1b_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_main_pd_1b:
+      disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.capacity_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.read.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_nested2_1c1_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.
+      host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_main_1c1_cmaui_1:
+      memory.resident_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_main_pd_1b_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_nested2_ps_1b_test_nested2Level:
+      disk.device.read.bytes_server_main_1c1_cmaui_21:
         type: org.openecomp.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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.latency_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_main_pd_1b:
+      disk.root.size_server_nested2_1c1_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:
@@ -4610,13 +4624,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_main_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_main_ps_1b:
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_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:
@@ -4646,90 +4654,90 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.write.requests_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_jsa_security_group1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.allocation_server_main_1c1_cmaui_21:
+        type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_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_jsa_security_group1_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_main_pd_1b:
+      disk.device.read.requests_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_main_1c1_cmaui_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_main_1c1_cmaui_2:
+      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.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_main_pd_1b:
+      disk.device.read.bytes_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.capacity_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.requests.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.allocation_server_main_1c1_cmaui_11:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.allocation_server_main_1c1_cmaui_11:
+        type: org.openecomp.capabilities.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_nested2_pd_1b_test_nested2Level:
+      disk.capacity_server_main_ps_1b_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:
@@ -4748,13 +4756,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: org.openecomp.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_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.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_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4771,15 +4785,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_main_1b_port:
+      disk.write.requests.rate_server_main_1c1_cmaui_21:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_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_main_1c1_cmaui_11:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4789,19 +4802,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
-        type: org.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_main_1c1_cmaui_1:
+      disk.device.write.requests_server_main_1c1_cmaui_21:
         type: org.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_main_1c1_cmaui_2:
+      disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4813,175 +4820,157 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_main_ps_1b:
+      disk.allocation_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      feature_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      scalable_server_main_1c1_cmaui_2:
-        type: tosca.capabilities.Scalable
+      disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_nested2_pd_1b_test_nested2Level:
+      disk.device.capacity_server_main_1c1_cmaui_21:
         type: org.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_main_1c1_cmaui_1:
+      scalable_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.write.bytes.rate_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_main_pd_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      disk.iops_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_main_pd_1b_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_cmaui_port_12:
+        type: org.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_main_pd_1b:
+      network.incoming.bytes_cmaui_port_11:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.latency_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_nested2_1c1_cmaui_2_test_nested2Level:
+      cpu.delta_server_main_1c1_cmaui_21:
         type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_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_main_pd_1b:
+      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_main_pd_1b:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.latency_server_nested2_pd_1b_test_nested2Level:
+      disk.device.write.bytes_server_main_1c1_cmaui_21:
         type: org.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_main_ps_1b:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
+      cpu_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.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_nested2_1c1_cmaui_2_test_nested2Level:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_nested2_pd_1b_test_nested2Level:
+      disk.device.allocation_server_nested2_1c1_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.allocation_server_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.allocation_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5006,8 +4995,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_main_pd_1b:
-        type: tosca.capabilities.Node
+      disk.device.latency_server_main_1c1_cmaui_21:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -5017,26 +5007,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      cpu_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      endpoint_server_nested2_1c1_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_server_main_ps_1b_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
-      endpoint_server_nested2_1c1_cmaui_2_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests.rate_server_main_pd_1b_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
@@ -5057,68 +5053,80 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_main_ps_1b:
+      disk.device.capacity_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_test_nested2Level:
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_main_ps_1b:
+      disk.device.write.bytes_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_main_1:
+      network.incoming.bytes_cmaui_port_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_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      binding_pd_server_main_1b_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
+      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_nested2_1c1_cmaui_1_test_nested2Level:
+      memory.resident_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
+      vcpus_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.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_nested2_ps_1b_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.openecomp.capabilities.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_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_main_1b_port:
+      disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5140,31 +5148,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_main_pd_1b:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.read.requests_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_nested2_pd_1b_test_nested2Level:
+      memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1:
+      feature_pd_server_main_1b_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5188,7 +5207,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_main_1c1_cmaui_2:
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5200,67 +5219,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_main_1c1_cmaui_2:
+      disk.device.usage_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_main_1c1_cmaui_1:
+      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.capacity_server_nested2_1c1_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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.write.requests_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_pd_1b_test_nested2Level:
+      disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_main_ps_1b:
+      disk.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.latency_server_main_1c1_cmaui_11:
         type: org.openecomp.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_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_12:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5272,25 +5291,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_main_ps_1b:
+      disk.device.allocation_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_main_1c1_cmaui_1:
+      vcpus_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_main_1b_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5313,26 +5331,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_main_1c1_cmaui_1:
+      memory.resident_server_main_1c1_cmaui_11:
         type: org.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_main_1c1_cmaui_2:
+      network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level:
+      disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      network.outpoing.packets_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -5343,364 +5362,388 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      network.outpoing.packets_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      memory.resident_server_nested2_1c1_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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.capacity_server_nested2_pd_1b_test_nested2Level:
+        type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.ephemeral.size_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_main_pd_1b_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_main_1c1_cmaui_1:
+      memory.resident_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      disk.device.read.requests.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      disk.device.capacity_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_main_1c1_cmaui_1:
+      disk.read.bytes_server_main_1c1_cmaui_21:
         type: org.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_nested2_1c1_cmaui_2_test_nested2Level:
+      os_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.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_nested2_pd_1b_test_nested2Level:
+      host_server_nested2_ps_1b_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.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_main_pd_1b:
+      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_pd_server_main_1b_port:
+      disk.root.size_server_main_1c1_cmaui_21:
         type: org.openecomp.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_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      disk.usage_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      cpu_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_main_ps_1b:
+      disk.read.requests_server_main_1c1_cmaui_11:
         type: org.openecomp.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_main_1c1_cmaui_1:
+      memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: org.openecomp.capabilities.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_nested2_1c1_cmaui_1_test_nested2Level:
+      network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
         type: org.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_nested2_ps_1b_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_main_1c1_cmaui_2:
+      disk.ephemeral.size_server_main_1c1_cmaui_21:
         type: org.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      host_server_main_1c1_cmaui_11:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.device.iops_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.latency_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests_server_nested2_1c1_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_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      instance_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      memory_server_nested2_1c1_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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.read.requests.rate_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
+      disk.device.read.requests.rate_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.read.bytes_server_main_1c1_cmaui_11:
         type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      network.outpoing.packets_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_main_pd_1b:
-        type: tosca.capabilities.network.Bindable
+      disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
+        type: org.openecomp.capabilities.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_main_ps_1b:
+      disk.root.size_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_ps_1b_test_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_nested2_ps_1b_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_nested2_1c1_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.
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level:
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_ps_server_main_1b_port:
-        type: tosca.capabilities.Attachment
+      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
+      disk.device.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.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_nested2_pd_1b_test_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_jsa_security_group1_test_resourceGroup_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_nested2_ps_1b_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.usage_server_nested2_ps_1b_test_nested2Level:
+        type: org.openecomp.capabilities.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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.ephemeral.size_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.root.size_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_nested2_ps_1b_test_nested2Level:
+      disk.iops_server_nested2_1c1_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_server_main_pd_1b:
+      memory_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group1_test_resourceGroup_test_nested2Level:
+      feature_jsa_security_group2_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_ps_server_main_1b_port:
+      network.incoming.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
         type: org.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_main_ps_1b:
+      disk.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_nested2_ps_1b_test_nested2Level:
+      cpu_util_server_main_1c1_cmaui_21:
         type: org.openecomp.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_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.device.write.requests.rate_server_main_1c1_cmaui_21:
         type: org.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_pd_pattern4_test_nested_pattern_4_main_1:
+      network.outgoing.bytes.rate_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      instance_server_main_1c1_cmaui_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
+      network.outgoing.packets.rate_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.device.iops_server_main_1c1_cmaui_21:
         type: org.openecomp.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_main_1c1_cmaui_1:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_main_1c1_cmaui_2:
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_ps_1b:
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_main_ps_1b_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:
@@ -5712,13 +5755,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_cmaui_port_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_main_pd_1b:
+      cpu.delta_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5735,43 +5783,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_main_pd_1b:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      vcpus_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_nested2_1c1_cmaui_2_test_nested2Level:
+      disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.read.bytes.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      disk.device.write.requests.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      disk.iops_server_main_ps_1b_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:
@@ -5788,20 +5836,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_nested2_pd_1b_test_nested2Level:
+      cpu_util_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.allocation_server_nested2_pd_1b_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -5811,98 +5860,115 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_11:
         type: org.openecomp.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_nested2_1c1_cmaui_2_test_nested2Level:
+      network.incoming.packets_cmaui_port_12:
         type: org.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_pd_pattern4_test_nested_pattern_4_main_1:
+      network.incoming.bytes.rate_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_nested2_1c1_cmaui_1_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
+        type: org.openecomp.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_main_ps_1b:
+      cpu_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.write.bytes.rate_server_nested2_1c1_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_server_nested2_ps_1b_test_nested2Level:
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1_test_nested2Level:
+      vcpus_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_nested2_pd_1b_test_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_nested2_1c1_cmaui_1_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_main_1c1_cmaui_1:
+      disk.write.requests_server_main_1c1_cmaui_11:
         type: org.openecomp.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_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      memory.usage_server_main_1c1_cmaui_21:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_main_1:
+      memory_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      endpoint_server_main_ps_1b_1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_cmaui_port_1_test_nested2Level:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_1:
+      feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_main_pd_1b:
+      disk.capacity_server_main_1c1_cmaui_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5920,25 +5986,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.read.requests_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_2:
+      disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
+      network.outgoing.bytes_ps_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5956,13 +6022,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      cpu.delta_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outgoing.bytes_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5979,13 +6051,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_main_1c1_cmaui_2:
-        type: tosca.capabilities.Endpoint.Admin
+      memory_server_main_1c1_cmaui_21:
+        type: org.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_main_1c1_cmaui_1:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.write.bytes_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_main_pd_1b_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
@@ -6000,14 +6080,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-        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_main_ps_1b_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_main_1b_port:
-        type: tosca.capabilities.Node
+      disk.capacity_server_main_1c1_cmaui_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -6017,6 +6097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_main_1c1_cmaui_11:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6042,19 +6127,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
+      disk.device.iops_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_main_pd_1b:
+      disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6065,25 +6156,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      memory_server_main_1c1_cmaui_11:
         type: org.openecomp.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_nested2_ps_1b_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
+      disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level:
         type: org.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_main_pd_1b:
+      disk.device.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6094,13 +6184,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_main_1b_port:
+      disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.read.bytes.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6111,7 +6201,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_main_pd_1b:
+      disk.device.write.bytes.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6122,344 +6212,347 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Node
+      memory_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes.rate_pd_server_main_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_nested2_pd_1b_test_nested2Level:
+      disk.device.read.requests_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_main_1b_port:
+      disk.read.requests_server_main_1c1_cmaui_21:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.device.capacity_server_nested2_pd_1b_test_nested2Level:
         type: org.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_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_12:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_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_cmaui_port_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_main_1c1_cmaui_1:
+      network.incoming.bytes.rate_cmaui_port_11:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_nested2_1b_port_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      disk.device.iops_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested2Level:
-        type: tosca.capabilities.Node
+      os_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_main_1c1_cmaui_1:
+      disk.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level:
+      memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_2:
+      disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_nested2_1c1_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.
+      attachment_pd_server_nested2_1b_port_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_nested2_1c1_cmaui_1_test_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_cmaui_port_2_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_nested2_pd_1b_test_nested2Level:
+      disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_ps_1b_test_nested2Level:
+      cpu_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_nested2_1b_port_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_main_pd_1b_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_ps_server_main_1b_port:
+      memory.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pd_server_main_1b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      memory.usage_server_main_1c1_cmaui_11:
+        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
-      binding_server_main_1c1_cmaui_1:
-        type: tosca.capabilities.network.Bindable
+      disk.read.bytes.rate_server_main_1c1_cmaui_21:
+        type: org.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_nested2_pd_1b_test_nested2Level:
+      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.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_main_1c1_cmaui_2:
-        type: tosca.capabilities.network.Bindable
+      disk.write.requests_server_main_1c1_cmaui_21:
+        type: org.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_main_ps_1b:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      cpu_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.usage_server_nested2_pd_1b_test_nested2Level:
         type: org.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_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.device.read.bytes_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_main_1c1_cmaui_2:
+      disk.device.write.bytes.rate_server_main_1c1_cmaui_21:
         type: org.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_pd_pattern4_test_nested_pattern_4_main_1:
+      feature_pd_server_nested2_1b_port_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_main_1c1_cmaui_1:
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.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_nested2_1c1_cmaui_2_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      binding_cmaui_port_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets_pd_server_main_1b_port:
+      memory_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_nested2_pd_1b_test_nested2Level:
+      disk.read.bytes_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_nested2_1b_port_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      vcpus_server_main_ps_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      host_server_main_ps_1b:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      instance_server_nested2_pd_1b_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.read.bytes_server_main_ps_1b_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
-      endpoint_server_main_ps_1b:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.bytes.rate_server_main_1c1_cmaui_21:
         type: org.openecomp.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_main_1c1_cmaui_2:
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
+      cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_main_1c1_cmaui_1:
+      feature_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_nested2_1c1_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.usage_server_main_pd_1b_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_main_ps_1b:
+      memory_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Attachment
+      binding_pd_server_nested2_1b_port_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_ps_server_nested2_1b_port_test_nested2Level:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_main_1:
+      disk.device.write.bytes_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_nested2_1c1_cmaui_2_test_nested2Level:
+      vcpus_server_main_1c1_cmaui_11:
         type: org.openecomp.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_nested2_pd_1b_test_nested2Level:
+      network.incoming.packets_ps_server_nested2_1b_port_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
+      cpu_server_nested2_1c1_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      disk.write.requests_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2_pd_1b_test_nested2Level:
+      memory.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_main_1c1_cmaui_1:
+      disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
         type: org.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_main_ps_1b:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_main_pd_1b_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_main_1c1_cmaui_2:
+      disk.write.bytes.rate_server_main_1c1_cmaui_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6483,19 +6576,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes_server_main_ps_1b:
+      disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6513,24 +6594,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests.rate_server_nested2_1c1_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_ps_server_main_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       scalable_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -6554,32 +6623,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.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_main_1c1_cmaui_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_main_1c1_cmaui_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.resident_server_nested2_ps_1b_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6604,12 +6647,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       attachment_ps_server_nested2_1b_port_test_nested2Level:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -6621,31 +6658,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_main_1c1_cmaui_1:
+      disk.device.write.requests_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_main_1c1_cmaui_2:
+      disk.allocation_server_main_ps_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_main_1c1_cmaui_2:
+      disk.latency_server_main_pd_1b_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_main_ps_1b:
+      disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6669,36 +6700,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_ps_server_main_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.latency_server_nested2_pd_1b_test_nested2Level:
         type: org.openecomp.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_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: org.openecomp.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_main_1c1_cmaui_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -6710,30 +6717,38 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_main_1c1_cmaui_2:
+      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.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_main_ps_1b:
+      network.outgoing.packets.rate_cmaui_port_12:
         type: org.openecomp.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_main_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_12:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      binding_cmaui_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6756,60 +6771,45 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_12:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_ps_server_main_1b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_cmaui_port_11:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
       feature_test_resourceGroup_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_main_ps_1b:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_server_main_ps_1b:
+      disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_nested2_test_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_cmaui_port_1_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_main_ps_1b:
+      disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level:
         type: org.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_nested2_1c1_cmaui_1_test_nested2Level:
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -7428,41 +7428,41 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_pattern4_test_nested_pattern_4_nested2:
+    - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+        - 1
+        - 1
+    - dependency_server_pd_pattern4_test_nested_pattern_4_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+        - 0
+        - UNBOUNDED
+    - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+    - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -7537,33 +7537,33 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
+        - 1
+        - 1
+    - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -7630,9 +7630,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        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_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -7683,12 +7682,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.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_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7713,18 +7706,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.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_ps_server_nested2_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -7796,19 +7777,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.write.bytes.rate_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_nested2_ps_1b:
+      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
+      disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.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_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -7855,87 +7842,102 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.iops_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_nested2_pd_1b:
+      disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_nested2_1b_port:
+      disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_nested2_pd_1b:
+      network.incoming.packets_pd_server_nested2_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.write.bytes.rate_server_nested2_pd_1b:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_nested2_1c1_cmaui_1:
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.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_nested2_1c1_cmaui_2:
+      disk.device.capacity_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.capacity_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_nested2_ps_1b:
+      disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_nested2_pd_1b:
+      disk.write.bytes_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      disk.latency_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -7967,19 +7969,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_nested2_ps_1b:
+      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.capacity_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8009,28 +8005,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_resourceGroup:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8042,12 +8028,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8077,6 +8057,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8095,7 +8081,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8140,25 +8126,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8187,20 +8161,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_nested2_ps_1b:
+      disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.Node
+      disk.device.usage_server_nested2_ps_1b:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -8216,7 +8190,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8234,18 +8208,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.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_nested2_1c1_cmaui_2:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -8302,6 +8264,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8313,13 +8281,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_nested2_1b_port:
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      network.incoming.bytes_pd_server_nested2_1b_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8343,7 +8311,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8355,6 +8323,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8379,6 +8353,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+        type: org.openecomp.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8391,7 +8371,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8403,6 +8383,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_pd_server_nested2_1b_port:
         type: tosca.capabilities.Node
         occurrences:
@@ -8426,31 +8412,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.capacity_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.capacity_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_nested2_pd_1b:
+      instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_nested2_ps_1b:
+      disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8461,6 +8447,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8483,6 +8475,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8501,6 +8508,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8559,43 +8572,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
+      disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.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_nested2_1c1_cmaui_1:
+      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.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_nested2_1c1_cmaui_2:
+      host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2:
+      disk.device.iops_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_nested2_pd_1b:
+      disk.device.iops_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.write.bytes.rate_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8618,6 +8638,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       disk.device.read.requests_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8644,17 +8671,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.usage_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8667,13 +8689,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8696,6 +8718,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: org.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_nested2_1c1_cmaui_2:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -8719,6 +8747,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: org.openecomp.capabilities.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8737,12 +8771,23 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.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_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.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_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8791,12 +8836,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.capabilities.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.capabilities.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_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8809,6 +8866,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_server_nested2_1c1_cmaui_2:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -8848,12 +8910,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested_pattern_4_nested2:
         type: tosca.capabilities.Node
         occurrences:
@@ -8882,31 +8938,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      disk.usage_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_nested2_1c1_cmaui_1:
+      disk.usage_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_nested2_1c1_cmaui_2:
+      disk.device.write.requests_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_nested2_pd_1b:
+      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
+      disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8918,6 +8974,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -8947,31 +9009,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      disk.device.read.requests.rate_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_nested2_ps_1b:
+      disk.read.requests_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_nested2_1c1_cmaui_2:
+      disk.device.read.requests.rate_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_nested2_1c1_cmaui_2:
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -8983,13 +9039,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.requests.rate_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9032,29 +9081,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9091,12 +9129,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        type: org.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9114,6 +9146,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes_server_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9132,12 +9169,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.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_pd_pattern4_test_nested_pattern_4_nested2:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -9148,12 +9191,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-        type: org.openecomp.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_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9195,6 +9232,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+        type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9248,12 +9291,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.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_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9284,40 +9321,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       attachment_cmaui_port_1:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -9335,12 +9350,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: org.openecomp.capabilities.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_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9359,6 +9368,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+        type: org.openecomp.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_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9382,13 +9397,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -9417,12 +9428,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-        type: org.openecomp.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_nested2_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9451,19 +9456,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_nested2_pd_1b:
+      disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.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_nested2_ps_1b:
+      memory_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      disk.write.requests.rate_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -9475,31 +9480,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.bytes_server_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_nested2_pd_1b:
+      disk.latency_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_nested2_1c1_cmaui_1:
+      cpu_util_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_nested2_1c1_cmaui_1:
+      instance_server_nested2_ps_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_nested2_ps_1b:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -9555,12 +9560,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: org.openecomp.capabilities.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_nested2_pd_1b:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -9572,20 +9571,21 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
+      disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.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_nested2_ps_1b:
+      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
         type: org.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-        type: tosca.capabilities.Node
+      disk.device.allocation_server_nested2_ps_1b:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -9594,7 +9594,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -9606,13 +9606,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_nested2_1c1_cmaui_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
         type: org.openecomp.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_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.allocation_server_nested2_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -12236,65 +12236,65 @@ node_types:
         description: UID of OAM network
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_order:
-        type: integer
+      port_pd_server_pattern4_port_02_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_vlan_requirements:
-        type: list
+      port_pd_server_pattern4_port_01_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_server_pattern4_port_2_network_role_tag:
+      port_pd_server_pattern4_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_mac_requirements:
+      port_pd_server_pattern4_port_01_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      availability_zone_0:
-        type: string
-        description: availabilityzone name
+      port_pd_server_pattern4_port_02_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_ip_requirements:
+      port_pd_server_pattern4_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_vlan_requirements:
-        type: list
+      availability_zone_0:
+        type: string
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       net:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role_tag:
-        type: string
+      port_pd_server_pattern4_port_02_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_02_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       pd_server_pattern4_flavor:
         type: string
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_server_pattern4_port_01_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_ip_requirements:
-        type: list
+      port_pd_server_pattern4_port_02_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_server_pattern4_port_1_exCP_naming:
+      port_pd_server_pattern4_port_01_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
@@ -12309,7 +12309,7 @@ node_types:
         description: Flavor for PS server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_order:
+      port_pd_server_pattern4_port_01_order:
         type: integer
         required: true
         status: SUPPORTED
@@ -12318,23 +12318,23 @@ node_types:
         description: Flavor for PD server
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_network_role:
-        type: string
+      port_pd_server_pattern4_port_02_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_server_pattern4_port_02_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd_server_pattern4_port_1_subnetpoolid:
-        type: string
+      port_pd_server_pattern4_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_server_pattern4_port_2_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -12350,6 +12350,19 @@ node_types:
         description: pattern4_attr_1_value
         status: SUPPORTED
     requirements:
+    - dependency_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pd_server_pattern4_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_server_pd_pattern4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -12364,64 +12377,80 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pattern4_port_1:
+    - dependency_pd_server_pattern4_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pattern4_port_1:
+    - link_pd_server_pattern4_port_02:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      disk.root.size_server_pd_pattern4:
+        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
-    - link_pd_server_pattern4_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+      disk.device.write.bytes_server_pd_pattern4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - 1
-    capabilities:
-      disk.root.size_server_pd_pattern4:
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      binding_pd_server_pattern4_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.incoming.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      feature_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.allocation_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      disk.device.usage_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -12451,15 +12480,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Node
+      binding_pd_server_pattern4_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.latency_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -12472,16 +12498,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pattern4_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pd_server_pattern4_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_server_pd_pattern4:
         type: tosca.capabilities.Node
         occurrences:
@@ -12511,6 +12527,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_pattern4_port_01:
+        type: org.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_pd_pattern4:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -12524,144 +12546,138 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_pattern4:
+      network.incoming.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_pattern4:
+      memory.resident_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.requests_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      disk.write.requests_server_pd_pattern4:
         type: org.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_pd_pattern4:
+      network.outgoing.bytes_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_pattern4:
+      disk.device.write.requests.rate_server_pd_pattern4:
         type: org.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_pd_pattern4:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_pd_server_pattern4_port_1:
+      memory.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      vcpus_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      disk.capacity_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      network.outpoing.packets_pd_server_pattern4_port_01:
         type: org.openecomp.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_pd_server_pattern4_port_2:
+      network.outpoing.packets_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_pd_pattern4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_pattern4:
+      disk.device.iops_server_pd_pattern4:
         type: org.openecomp.capabilities.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_pd_pattern4:
+      disk.device.read.bytes.rate_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.allocation_server_pd_pattern4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
+      disk.usage_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      disk.read.bytes_server_pd_pattern4:
         type: org.openecomp.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_pd_pattern4:
+      network.outgoing.packets.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -12689,14 +12705,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_2:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -12714,44 +12723,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pattern4_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pattern4_port_1:
+      disk.device.write.requests_server_pd_pattern4:
         type: org.openecomp.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_pd_server_pattern4_port_1:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.capabilities.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_pd_pattern4:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02:
         type: org.openecomp.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_pd_server_pattern4_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pattern4_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_2:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -12762,4 +12762,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
index 3e27a96..43aeb45 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml
@@ -253,19 +253,19 @@ topology_template:
           get_input: jsa_name
         service_template_filter:
           substitute_service_template: nested-pattern-4ServiceTemplate.yaml
-        port_pd_server_pattern4_port_1_ip_requirements:
+        port_pd_server_pattern4_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pd_server_pattern4_port_02_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pd_server_pattern4_port_1_mac_requirements:
+        port_pd_server_pattern4_port_02_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_ip_requirements:
+        port_pd_server_pattern4_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
index b489bc4..4439f4e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
@@ -298,4 +298,4 @@ topology_template:
       - local_storage
       dependency_pd_server_main_1b_pd_server_main_1b_port:
       - pd_server_main_1b_pd_server_main_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
index c4c0dcc..150bc51 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
@@ -298,4 +298,4 @@ topology_template:
       - dependency
       local_storage_ps_server_main_1b:
       - ps_server_main_1b
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
index 91a958f..26fcd68 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
@@ -121,19 +121,6 @@ topology_template:
       entry_schema:
         type: string
   node_templates:
-    server_pd_pattern4:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4
-      properties:
-        flavor:
-          get_input: pd_server_pattern4_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: pd_server_pattern4_image
-        name:
-          get_input:
-          - pd_server_pattern4_names
-          - 0
     pd_server_pattern4_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -164,8 +151,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pd_pattern4
+          node: server_pd_pattern4_1
           relationship: tosca.relationships.network.BindsTo
+    server_pd_pattern4_1:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4
+      properties:
+        flavor:
+          get_input: pd_server_pattern4_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: pd_server_pattern4_image
+        name:
+          get_input:
+          - pd_server_pattern4_names
+          - 0
     pd_server_pattern4_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -196,7 +196,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pd_pattern4
+          node: server_pd_pattern4_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested-pattern-4-same-type_group:
@@ -205,181 +205,175 @@ topology_template:
         heat_file: ../Artifacts/nested-pattern-4-same-type.yml
         description: nested1
       members:
-      - server_pd_pattern4
       - pd_server_pattern4_port_1
+      - server_pd_pattern4_1
       - pd_server_pattern4_port_2
   outputs:
     pattern4_attr_1:
       description: pattern4_attr_1_value
-      value: server_pd_pattern4
+      value: server_pd_pattern4_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4_2
     capabilities:
-      disk.root.size_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.root.size
-      disk.device.write.bytes_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.write.bytes
+      disk.ephemeral.size_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.ephemeral.size
       network.outgoing.bytes_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.outgoing.bytes
-      disk.allocation_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.allocation
-      disk.device.usage_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.usage
+      endpoint_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - endpoint
+      memory.usage_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - memory.usage
       network.outgoing.bytes_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.outgoing.bytes
-      disk.write.bytes.rate_server_pd_pattern4:
-      - server_pd_pattern4
+      disk.device.capacity_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.capacity
+      disk.write.bytes.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
       - disk.write.bytes.rate
-      disk.ephemeral.size_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.ephemeral.size
-      cpu.delta_server_pd_pattern4:
-      - server_pd_pattern4
-      - cpu.delta
-      disk.write.bytes_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.write.bytes
+      disk.device.iops_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.iops
       feature_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - feature
       feature_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - feature
-      disk.latency_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.latency
-      endpoint_server_pd_pattern4:
-      - server_pd_pattern4
-      - endpoint
+      disk.device.latency_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.latency
+      disk.write.requests_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.write.requests
+      disk.device.read.requests.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.read.requests.rate
       attachment_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - attachment
       attachment_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - attachment
-      feature_server_pd_pattern4:
-      - server_pd_pattern4
-      - feature
-      disk.device.read.requests.rate_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.read.requests.rate
-      instance_server_pd_pattern4:
-      - server_pd_pattern4
-      - instance
-      cpu_server_pd_pattern4:
-      - server_pd_pattern4
-      - cpu
-      disk.device.read.requests_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.read.requests
-      host_server_pd_pattern4:
-      - server_pd_pattern4
-      - host
-      cpu_util_server_pd_pattern4:
-      - server_pd_pattern4
+      cpu_util_server_pd_pattern4_1:
+      - server_pd_pattern4_1
       - cpu_util
-      memory.resident_server_pd_pattern4:
-      - server_pd_pattern4
-      - memory.resident
-      disk.read.requests_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.read.requests
-      disk.read.bytes.rate_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.read.bytes.rate
-      disk.device.write.bytes.rate_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.read.bytes
-      disk.write.requests_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.write.requests
-      disk.device.write.requests.rate_server_pd_pattern4:
-      - server_pd_pattern4
+      memory_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - memory
+      scalable_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - scalable
+      disk.latency_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.latency
+      disk.device.write.requests.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
       - disk.device.write.requests.rate
-      memory.usage_server_pd_pattern4:
-      - server_pd_pattern4
-      - memory.usage
-      vcpus_server_pd_pattern4:
-      - server_pd_pattern4
-      - vcpus
-      disk.capacity_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.capacity
-      binding_server_pd_pattern4:
-      - server_pd_pattern4
-      - binding
+      disk.allocation_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.allocation
+      disk.device.read.bytes.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.read.bytes.rate
+      disk.device.usage_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.usage
+      disk.read.bytes.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.read.bytes.rate
+      disk.device.write.bytes_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.write.bytes
+      memory.resident_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - memory.resident
+      host_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - host
+      disk.write.bytes_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.write.bytes
       network.outpoing.packets_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.outpoing.packets
       network.outpoing.packets_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.outpoing.packets
+      feature_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - feature
+      disk.device.write.requests_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.write.requests
+      disk.write.requests.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.write.requests.rate
       network.incoming.packets.rate_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.incoming.packets.rate
       network.incoming.bytes_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.incoming.bytes
-      disk.device.iops_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.iops
+      disk.device.read.bytes_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.read.bytes
       network.incoming.packets.rate_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.incoming.packets.rate
       network.incoming.bytes_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.incoming.bytes
-      disk.device.read.bytes.rate_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.read.bytes.rate
-      disk.device.allocation_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.allocation
+      disk.read.bytes_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.read.bytes
       network.outgoing.bytes.rate_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.outgoing.bytes.rate
       network.outgoing.bytes.rate_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.outgoing.bytes.rate
-      disk.usage_server_pd_pattern4:
-      - server_pd_pattern4
+      instance_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - instance
+      vcpus_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - vcpus
+      cpu.delta_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - cpu.delta
+      binding_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - binding
+      disk.device.read.requests_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.read.requests
+      disk.device.write.bytes.rate_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.write.bytes.rate
+      disk.usage_server_pd_pattern4_1:
+      - server_pd_pattern4_1
       - disk.usage
-      disk.read.bytes_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.read.bytes
-      os_server_pd_pattern4:
-      - server_pd_pattern4
-      - os
-      memory_server_pd_pattern4:
-      - server_pd_pattern4
-      - memory
-      disk.iops_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.iops
-      scalable_server_pd_pattern4:
-      - server_pd_pattern4
-      - scalable
+      disk.device.allocation_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.device.allocation
       binding_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - binding
+      os_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - os
       network.incoming.bytes.rate_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.incoming.bytes.rate
-      disk.write.requests.rate_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.write.requests.rate
-      disk.device.latency_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.latency
+      disk.iops_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.iops
       binding_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - binding
@@ -389,28 +383,34 @@ topology_template:
       network.outgoing.packets.rate_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.outgoing.packets.rate
-      disk.device.write.requests_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.write.requests
       network.incoming.packets_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - network.incoming.packets
+      disk.read.requests_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.read.requests
+      disk.root.size_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.root.size
       network.outgoing.packets.rate_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.outgoing.packets.rate
       network.incoming.packets_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - network.incoming.packets
-      disk.device.capacity_server_pd_pattern4:
-      - server_pd_pattern4
-      - disk.device.capacity
+      disk.capacity_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - disk.capacity
+      cpu_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - cpu
     requirements:
+      local_storage_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - local_storage
       dependency_pd_server_pattern4_port_1:
       - pd_server_pattern4_port_1
       - dependency
-      local_storage_server_pd_pattern4:
-      - server_pd_pattern4
-      - local_storage
       dependency_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - dependency
@@ -420,6 +420,6 @@ topology_template:
       link_pd_server_pattern4_port_2:
       - pd_server_pattern4_port_2
       - link
-      dependency_server_pd_pattern4:
-      - server_pd_pattern4
-      - dependency
+      dependency_server_pd_pattern4_1:
+      - server_pd_pattern4_1
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
index b202e39..34a80a9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
@@ -25,57 +25,56 @@ topology_template:
       immutable: false
       type: string
       description: UID of OAM network
-    port_pd_server_pattern4_port_2_order:
-      type: integer
+    port_pd_server_pattern4_port_02_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd_server_pattern4_port_2_vlan_requirements:
-      type: list
+    port_pd_server_pattern4_port_01_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd_server_pattern4_port_2_network_role_tag:
+    port_pd_server_pattern4_port_01_subnetpoolid:
       type: string
       required: true
-    port_pd_server_pattern4_port_2_mac_requirements:
+    port_pd_server_pattern4_port_01_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_pd_server_pattern4_port_02_order:
+      type: integer
+      required: true
+    port_pd_server_pattern4_port_01_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     availability_zone_0:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pd_server_pattern4_port_2_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_server_pattern4_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     net:
       hidden: false
       immutable: false
       type: string
-    port_pd_server_pattern4_port_1_network_role_tag:
-      type: string
+    port_pd_server_pattern4_port_02_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
+    port_pd_server_pattern4_port_02_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     pd_server_pattern4_flavor:
       hidden: false
       immutable: false
       type: string
       description: Flavor for PD server
-    port_pd_server_pattern4_port_2_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd_server_pattern4_port_01_network_role:
+      type: string
       required: true
-    port_pd_server_pattern4_port_1_ip_requirements:
-      type: list
+    port_pd_server_pattern4_port_02_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_server_pattern4_port_1_exCP_naming:
+    port_pd_server_pattern4_port_01_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     security_group_name:
@@ -90,7 +89,7 @@ topology_template:
       immutable: false
       type: string
       description: Flavor for PS server
-    port_pd_server_pattern4_port_1_order:
+    port_pd_server_pattern4_port_01_order:
       type: integer
       required: true
     pd_server_pattern4_image:
@@ -98,19 +97,20 @@ topology_template:
       immutable: false
       type: string
       description: Flavor for PD server
-    port_pd_server_pattern4_port_1_network_role:
-      type: string
+    port_pd_server_pattern4_port_02_ip_requirements:
+      type: list
       required: true
-    port_pd_server_pattern4_port_2_network_role:
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd_server_pattern4_port_02_subnetpoolid:
       type: string
       required: true
-    port_pd_server_pattern4_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd_server_pattern4_port_1_subnetpoolid:
-      type: string
+    port_pd_server_pattern4_port_01_vlan_requirements:
+      type: list
       required: true
-    port_pd_server_pattern4_port_2_subnetpoolid:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_pattern4_port_02_network_role_tag:
       type: string
       required: true
     pd_server_pattern4_names:
@@ -121,78 +121,78 @@ topology_template:
       entry_schema:
         type: string
   node_templates:
-    server_pd_pattern4:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4
-      properties:
-        flavor:
-          get_input: pd_server_pattern4_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: pd_server_pattern4_image
-        name:
-          get_input:
-          - pd_server_pattern4_names
-          - 0
-    pd_server_pattern4_port_1:
+    pd_server_pattern4_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
         ip_requirements:
-          get_input: port_pd_server_pattern4_port_1_ip_requirements
+          get_input: port_pd_server_pattern4_port_01_ip_requirements
         network_role:
-          get_input: port_pd_server_pattern4_port_1_network_role
+          get_input: port_pd_server_pattern4_port_01_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - pd_server_pattern4_ips
             - 0
         subnetpoolid:
-          get_input: port_pd_server_pattern4_port_1_subnetpoolid
+          get_input: port_pd_server_pattern4_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pd_server_pattern4_port_1_mac_requirements
+          get_input: port_pd_server_pattern4_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pd_server_pattern4_port_1_exCP_naming
+          get_input: port_pd_server_pattern4_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pd_server_pattern4_port_1_vlan_requirements
+          get_input: port_pd_server_pattern4_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pd_server_pattern4_port_1_network_role_tag
+          get_input: port_pd_server_pattern4_port_01_network_role_tag
         network:
           get_input: net
         order:
-          get_input: port_pd_server_pattern4_port_1_order
+          get_input: port_pd_server_pattern4_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_pd_pattern4
           relationship: tosca.relationships.network.BindsTo
-    pd_server_pattern4_port_2:
+    server_pd_pattern4:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4
+      properties:
+        flavor:
+          get_input: pd_server_pattern4_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: pd_server_pattern4_image
+        name:
+          get_input:
+          - pd_server_pattern4_names
+          - 0
+    pd_server_pattern4_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
         ip_requirements:
-          get_input: port_pd_server_pattern4_port_2_ip_requirements
+          get_input: port_pd_server_pattern4_port_02_ip_requirements
         network_role:
-          get_input: port_pd_server_pattern4_port_2_network_role
+          get_input: port_pd_server_pattern4_port_02_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - pd_server_pattern4_ips
             - 1
         subnetpoolid:
-          get_input: port_pd_server_pattern4_port_2_subnetpoolid
+          get_input: port_pd_server_pattern4_port_02_subnetpoolid
         mac_requirements:
-          get_input: port_pd_server_pattern4_port_2_mac_requirements
+          get_input: port_pd_server_pattern4_port_02_mac_requirements
         exCP_naming:
-          get_input: port_pd_server_pattern4_port_2_exCP_naming
+          get_input: port_pd_server_pattern4_port_02_exCP_naming
         vlan_requirements:
-          get_input: port_pd_server_pattern4_port_2_vlan_requirements
+          get_input: port_pd_server_pattern4_port_02_vlan_requirements
         network_role_tag:
-          get_input: port_pd_server_pattern4_port_2_network_role_tag
+          get_input: port_pd_server_pattern4_port_02_network_role_tag
         network:
           get_input: net
         order:
-          get_input: port_pd_server_pattern4_port_2_order
+          get_input: port_pd_server_pattern4_port_02_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -205,9 +205,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pattern-4.yml
         description: nested1
       members:
+      - pd_server_pattern4_port_01
       - server_pd_pattern4
-      - pd_server_pattern4_port_1
-      - pd_server_pattern4_port_2
+      - pd_server_pattern4_port_02
   outputs:
     pattern4_attr_1:
       description: pattern4_attr_1_value
@@ -221,18 +221,33 @@ topology_template:
       disk.device.write.bytes_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.write.bytes
-      network.outgoing.bytes_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.outgoing.bytes
+      network.incoming.packets_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.incoming.packets
+      binding_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - binding
+      network.incoming.bytes_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.incoming.bytes
+      network.incoming.bytes_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.incoming.bytes
+      feature_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - feature
+      feature_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - feature
+      network.incoming.packets_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.incoming.packets
       disk.allocation_server_pd_pattern4:
       - server_pd_pattern4
       - disk.allocation
       disk.device.usage_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.usage
-      network.outgoing.bytes_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.outgoing.bytes
       disk.write.bytes.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.write.bytes.rate
@@ -245,24 +260,15 @@ topology_template:
       disk.write.bytes_server_pd_pattern4:
       - server_pd_pattern4
       - disk.write.bytes
-      feature_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - feature
-      feature_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - feature
+      binding_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - binding
       disk.latency_server_pd_pattern4:
       - server_pd_pattern4
       - disk.latency
       endpoint_server_pd_pattern4:
       - server_pd_pattern4
       - endpoint
-      attachment_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - attachment
-      attachment_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - attachment
       feature_server_pd_pattern4:
       - server_pd_pattern4
       - feature
@@ -278,18 +284,27 @@ topology_template:
       disk.device.read.requests_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.read.requests
+      network.incoming.packets.rate_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.incoming.packets.rate
       host_server_pd_pattern4:
       - server_pd_pattern4
       - host
       cpu_util_server_pd_pattern4:
       - server_pd_pattern4
       - cpu_util
+      network.incoming.packets.rate_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.incoming.packets.rate
       memory.resident_server_pd_pattern4:
       - server_pd_pattern4
       - memory.resident
       disk.read.requests_server_pd_pattern4:
       - server_pd_pattern4
       - disk.read.requests
+      network.outgoing.bytes_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.outgoing.bytes
       disk.read.bytes.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.read.bytes.rate
@@ -302,6 +317,9 @@ topology_template:
       disk.write.requests_server_pd_pattern4:
       - server_pd_pattern4
       - disk.write.requests
+      network.outgoing.bytes_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.outgoing.bytes
       disk.device.write.requests.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.write.requests.rate
@@ -314,48 +332,36 @@ topology_template:
       disk.capacity_server_pd_pattern4:
       - server_pd_pattern4
       - disk.capacity
+      network.outgoing.packets.rate_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.outgoing.packets.rate
+      network.outpoing.packets_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.outpoing.packets
+      network.outpoing.packets_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.outpoing.packets
       binding_server_pd_pattern4:
       - server_pd_pattern4
       - binding
-      network.outpoing.packets_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.outpoing.packets
-      network.incoming.packets.rate_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.incoming.packets.rate
-      network.incoming.bytes_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.incoming.bytes
       disk.device.iops_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.iops
-      network.incoming.packets.rate_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.incoming.packets.rate
-      network.incoming.bytes_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.incoming.bytes
       disk.device.read.bytes.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.read.bytes.rate
       disk.device.allocation_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.allocation
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.outgoing.bytes.rate
       disk.usage_server_pd_pattern4:
       - server_pd_pattern4
       - disk.usage
       disk.read.bytes_server_pd_pattern4:
       - server_pd_pattern4
       - disk.read.bytes
+      network.outgoing.packets.rate_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.outgoing.packets.rate
       os_server_pd_pattern4:
       - server_pd_pattern4
       - os
@@ -368,58 +374,52 @@ topology_template:
       scalable_server_pd_pattern4:
       - server_pd_pattern4
       - scalable
-      binding_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - binding
-      network.incoming.bytes.rate_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.outgoing.bytes.rate
       disk.write.requests.rate_server_pd_pattern4:
       - server_pd_pattern4
       - disk.write.requests.rate
       disk.device.latency_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.latency
-      binding_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - binding
-      network.incoming.bytes.rate_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.incoming.bytes.rate
-      network.outgoing.packets.rate_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.outgoing.packets.rate
       disk.device.write.requests_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.write.requests
-      network.incoming.packets_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
-      - network.incoming.packets
-      network.outgoing.packets.rate_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.outgoing.packets.rate
-      network.incoming.packets_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
-      - network.incoming.packets
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.outgoing.bytes.rate
+      attachment_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - attachment
+      network.incoming.bytes.rate_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
+      - network.incoming.bytes.rate
+      attachment_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - attachment
+      network.incoming.bytes.rate_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
+      - network.incoming.bytes.rate
       disk.device.capacity_server_pd_pattern4:
       - server_pd_pattern4
       - disk.device.capacity
     requirements:
-      dependency_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
+      dependency_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
       - dependency
       local_storage_server_pd_pattern4:
       - server_pd_pattern4
       - local_storage
-      dependency_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
+      dependency_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
       - dependency
-      link_pd_server_pattern4_port_1:
-      - pd_server_pattern4_port_1
+      link_pd_server_pattern4_port_02:
+      - pd_server_pattern4_port_02
       - link
-      link_pd_server_pattern4_port_2:
-      - pd_server_pattern4_port_2
+      link_pd_server_pattern4_port_01:
+      - pd_server_pattern4_port_01
       - link
       dependency_server_pd_pattern4:
       - server_pd_pattern4
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
index cc6778d..f4bca8d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml
@@ -112,19 +112,19 @@ topology_template:
           get_input: jsa_name
         service_template_filter:
           substitute_service_template: nested-pattern-4ServiceTemplate.yaml
-        port_pd_server_pattern4_port_1_ip_requirements:
+        port_pd_server_pattern4_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pd_server_pattern4_port_02_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pd_server_pattern4_port_1_mac_requirements:
+        port_pd_server_pattern4_port_02_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_ip_requirements:
+        port_pd_server_pattern4_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
@@ -205,10 +205,10 @@ topology_template:
         compute_cmaui_1c1_main_name:
         - get_input:
           - cmaui_1c1_main_names
-          - 1
+          - 0
         - get_input:
           - cmaui_1c1_main_names
-          - 0
+          - 1
         service_template_filter:
           substitute_service_template: Nested_cmaui_1c1_mainServiceTemplate.yaml
           count: 2
@@ -289,30 +289,12 @@ topology_template:
       instance_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - instance_server_pd_pattern4_test_nested_pattern_4_nested2
-      disk.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      feature_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - feature_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.ephemeral.size_server_pd_pattern4
       disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2
-      cpu.delta_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - cpu.delta_pd_server_main_1b
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
-      instance_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - instance_cmaui_1c1_main
-      instance_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - instance_cmaui_1c1_main
       feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - feature_test_nested_pattern_4_same_type_diff_file
@@ -322,108 +304,87 @@ topology_template:
       network.incoming.packets_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_2
-      disk.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outpoing.packets_pd_server_pattern4_port_01
+      cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.usage_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.usage_pd_server_main_1b
-      memory.resident_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - memory.resident_cmaui_1c1_main
-      os_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - os_pd_server_main_1b
-      memory.resident_server_main_1c1_cmaui_1:
+      - cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.read.requests_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - memory.resident_cmaui_1c1_main
+      - disk.device.read.requests_cmaui_1c1_main
       disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.read.bytes_server_pd_pattern4
       disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_nested2_1c1_cmaui_2
-      memory.usage_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - memory.usage_cmaui_1c1_main
-      memory.usage_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - memory.usage_cmaui_1c1_main
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      memory.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.read.bytes_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.read.bytes_ps_server_main_1b
-      disk.write.requests_server_main_1c1_cmaui_1:
+      - disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      binding_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - disk.write.requests_cmaui_1c1_main
+      - binding_cmaui_1c1_main
       cpu_util_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - cpu_util_server_pd_pattern4
-      disk.write.requests_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.write.requests_cmaui_1c1_main
       disk.ephemeral.size_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.ephemeral.size_server_nested2_pd_1b
       host_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - host_server_nested2_pd_1b
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      disk.device.latency_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.latency_ps_server_main_1b
       feature_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - feature_server_nested2_pd_1b
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.bytes.rate_pd_server_pattern4_port_2
-      disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.device.read.bytes_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.read.bytes_pd_server_main_1b
       disk.device.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests_server_nested2_1c1_cmaui_2
-      disk.read.requests_server_main_pd_1b:
+      cpu_util_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - disk.read.requests_pd_server_main_1b
+      - cpu_util_pd_server_main_1b
       disk.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_nested2_1c1_cmaui_1
+      disk.device.latency_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.latency_pd_server_main_1b
       disk.device.write.requests_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests_server_nested2_ps_1b
+      disk.device.read.requests_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.requests_cmaui_1c1_main
+      feature_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - feature_cmaui_1c1_main
       disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.allocation_server_pd_pattern4
-      disk.device.capacity_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.capacity_cmaui_1c1_main
       disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2
-      disk.device.capacity_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.capacity_cmaui_1c1_main
-      disk.latency_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.latency_pd_server_main_1b
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.bytes_pd_server_pattern4_port_02
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_nested2_pd_1b
-      disk.usage_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.usage_cmaui_1c1_main
-      disk.usage_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.usage_cmaui_1c1_main
+      network.incoming.bytes_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_02
+      disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.device.read.requests_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_nested2_ps_1b
@@ -433,15 +394,12 @@ topology_template:
       disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_nested2_1c1_cmaui_2
-      disk.read.requests_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.read.requests_cmaui_1c1_main
-      disk.write.requests_server_main_ps_1b:
+      feature_ps_server_main_1b_port_1:
       - abstract_ps_server_main_1b
-      - disk.write.requests_ps_server_main_1b
-      disk.iops_server_main_pd_1b:
+      - feature_ps_server_main_1b_ps_server_main_1b_port
+      vcpus_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - disk.iops_pd_server_main_1b
+      - vcpus_pd_server_main_1b
       disk.device.usage_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_nested2_pd_1b
@@ -460,30 +418,27 @@ topology_template:
       memory.resident_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_nested2_pd_1b
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.bytes.rate_pd_server_pattern4_port_02
       disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2
-      binding_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - binding_ps_server_main_1b
-      network.outgoing.bytes.rate_pd_server_main_1b_port:
+      disk.device.write.bytes.rate_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
-      binding_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - binding_cmaui_1c1_main_cmaui_port
-      binding_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - binding_cmaui_1c1_main_cmaui_port
+      - disk.device.write.bytes.rate_pd_server_main_1b
+      instance_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - instance_pd_server_main_1b
+      disk.read.bytes.rate_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.read.bytes.rate_ps_server_main_1b
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      disk.read.bytes.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.read.bytes.rate_pd_server_main_1b
       cpu.delta_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_nested2_1c1_cmaui_2
@@ -493,9 +448,9 @@ topology_template:
       disk.write.bytes_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_nested2_ps_1b
-      disk.write.requests.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.write.requests.rate_pd_server_main_1b
+      network.outgoing.bytes.rate_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
       disk.ephemeral.size_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.ephemeral.size_server_nested2_1c1_cmaui_1
@@ -505,21 +460,21 @@ topology_template:
       disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.bytes_pd_server_pattern4_port_2
+      network.outgoing.packets.rate_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port
       network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
-      cpu_util_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - cpu_util_ps_server_main_1b
-      disk.read.requests_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.read.requests_cmaui_1c1_main
-      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      binding_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - binding_cmaui_1c1_main
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outgoing.bytes_pd_server_pattern4_port_02
       disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2
@@ -532,54 +487,57 @@ topology_template:
       cpu_util_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - cpu_util_server_nested2_ps_1b
-      network.incoming.bytes_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.incoming.bytes_cmaui_1c1_main_cmaui_port
+      instance_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - instance_ps_server_main_1b
       network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_ps_server_nested2_1b_port
-      network.incoming.bytes_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.incoming.bytes_cmaui_1c1_main_cmaui_port
-      disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2
+      disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       memory.usage_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - memory.usage_server_nested2_ps_1b
-      disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       disk.capacity_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_nested2_1c1_cmaui_2
       disk.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_nested2_1c1_cmaui_2
-      network.incoming.packets.rate_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
-      network.incoming.packets.rate_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
-      cpu_util_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - cpu_util_cmaui_1c1_main
-      cpu_util_server_main_1c1_cmaui_2:
+      disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.allocation_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.allocation_pd_server_main_1b
+      endpoint_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - cpu_util_cmaui_1c1_main
+      - endpoint_cmaui_1c1_main
       host_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - host_server_pd_pattern4
       disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2
+      disk.usage_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.usage_cmaui_1c1_main
       network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
+      disk.device.write.requests_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.write.requests_pd_server_main_1b
       cpu_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - cpu_server_pd_pattern4
@@ -589,273 +547,294 @@ topology_template:
       disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2
+      host_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - host_pd_server_main_1b
       feature_jsa_security_group2_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - feature_jsa_security_group2_test_resourceGroup
-      scalable_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - scalable_pd_server_main_1b
-      disk.device.read.requests_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.requests_cmaui_1c1_main
-      disk.device.read.requests_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.requests_cmaui_1c1_main
-      feature_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - feature_cmaui_1c1_main
-      feature_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - feature_cmaui_1c1_main
-      disk.read.bytes.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.read.bytes.rate_cmaui_1c1_main
-      disk.read.bytes.rate_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.read.bytes.rate_cmaui_1c1_main
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.device.read.bytes.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.read.bytes.rate_ps_server_main_1b
+      - memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_1
+      cpu.delta_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - cpu.delta_ps_server_main_1b
       binding_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - binding_server_pd_pattern4
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.packets.rate_pd_server_pattern4_port_2
+      cpu_util_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - cpu_util_ps_server_main_1b
+      disk.write.bytes_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.write.bytes_cmaui_1c1_main
       network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_pd_server_nested2_1b_port
-      disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.device.iops_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.iops_cmaui_1c1_main
-      disk.device.iops_server_main_1c1_cmaui_2:
+      disk.usage_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - disk.device.iops_cmaui_1c1_main
+      - disk.usage_cmaui_1c1_main
       network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_2
-      disk.device.iops_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.iops_pd_server_main_1b
-      disk.device.write.requests.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.write.requests.rate_pd_server_main_1b
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      disk.device.write.bytes.rate_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.write.bytes.rate_ps_server_main_1b
       cpu_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - cpu_server_nested2_ps_1b
-      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - binding_pd_server_pattern4_port_02
+      disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      attachment_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - attachment_pd_server_main_1b_pd_server_main_1b_port
-      feature_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - feature_ps_server_main_1b_ps_server_main_1b_port
+      - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.root.size_server_nested2_1c1_cmaui_1
+      binding_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - binding_ps_server_main_1b_ps_server_main_1b_port
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - feature_pd_server_pattern4_port_01
+      network.outgoing.bytes.rate_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
       disk.read.bytes_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_nested2_pd_1b
+      network.outgoing.bytes.rate_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      os_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - os_ps_server_main_1b
+      disk.device.read.bytes_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.read.bytes_pd_server_main_1b
+      attachment_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - attachment_ps_server_main_1b_ps_server_main_1b_port
       cpu.delta_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_nested2_ps_1b
       feature_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - feature_ps_server_nested2_1b_port
-      disk.device.read.requests_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.read.requests_pd_server_main_1b
-      network.incoming.bytes.rate_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
-      disk.allocation_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.allocation_pd_server_main_1b
+      disk.latency_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.latency_cmaui_1c1_main
+      disk.write.bytes_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.write.bytes_cmaui_1c1_main
       disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_nested2_pd_1b
-      disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      disk.device.read.bytes.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.read.bytes.rate_pd_server_main_1b
       network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_ps_server_nested2_1b_port
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
-      disk.capacity_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.capacity_pd_server_main_1b
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       feature_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - feature_server_nested2_1c1_cmaui_2
-      vcpus_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - vcpus_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_1
+      endpoint_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - endpoint_cmaui_1c1_main
       network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.packets.rate_pd_server_pattern4_port_2
+      disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.read.bytes.rate_server_pd_pattern4
       disk.device.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_nested2_1c1_cmaui_1
+      feature_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - feature_ps_server_main_1b
+      network.outpoing.packets_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port
       disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_nested2_1c1_cmaui_1
-      disk.device.latency_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.latency_pd_server_main_1b
-      disk.device.read.requests.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.read.requests.rate_ps_server_main_1b
+      disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       network.incoming.bytes.rate_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_pd_server_nested2_1b_port
       binding_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - binding_server_nested2_pd_1b
+      disk.latency_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.latency_cmaui_1c1_main
       disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.root.size_server_pd_pattern4
       binding_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - binding_server_nested2_1c1_cmaui_2
-      instance_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - instance_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_1
-      disk.device.write.requests.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.requests.rate_cmaui_1c1_main
-      disk.device.write.requests.rate_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.requests.rate_cmaui_1c1_main
+      disk.device.write.bytes_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.write.bytes_pd_server_main_1b
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1
-      network.outpoing.packets_ps_server_main_1b_port:
+      disk.ephemeral.size_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - feature_pd_server_pattern4_port_2
+      - disk.ephemeral.size_ps_server_main_1b
       disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_nested2_1c1_cmaui_1
+      disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
+      disk.iops_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.iops_cmaui_1c1_main
       network.outgoing.bytes_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_2
       network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
-      network.outgoing.bytes_ps_server_main_1b_port:
+      disk.device.read.bytes.rate_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port
-      disk.ephemeral.size_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.ephemeral.size_pd_server_main_1b
+      - disk.device.read.bytes.rate_ps_server_main_1b
+      disk.device.usage_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.usage_cmaui_1c1_main
       disk.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_nested2_1c1_cmaui_2
-      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       disk.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_nested2_1c1_cmaui_2
+      disk.device.read.bytes.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.bytes.rate_cmaui_1c1_main
       network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_2
+      disk.device.write.requests.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.write.requests.rate_pd_server_main_1b
       network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      endpoint_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - endpoint_pd_server_main_1b
       disk.iops_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.iops_server_pd_pattern4
+      network.incoming.packets.rate_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port
       binding_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_1
-      disk.device.capacity_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.capacity_ps_server_main_1b
+      disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
-      disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
+      memory.usage_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - memory.usage_pd_server_main_1b
+      disk.root.size_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.root.size_ps_server_main_1b
+      network.incoming.packets_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.packets.rate_pd_server_pattern4_port_02
+      disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2
+      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
       - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2
+      scalable_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - scalable_cmaui_1c1_main
       disk.device.read.requests.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_nested2_ps_1b
       disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.write.bytes.rate_server_pd_pattern4
+      disk.iops_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.iops_cmaui_1c1_main
+      os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.usage_server_nested2_1c1_cmaui_1
-      os_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - os_cmaui_1c1_main
-      binding_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
-      - binding_pd_server_pattern4_port_1
-      os_server_main_1c1_cmaui_1:
+      - network.outgoing.packets.rate_pd_server_pattern4_port_02
+      disk.capacity_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.capacity_pd_server_main_1b
+      disk.device.write.requests_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - os_cmaui_1c1_main
+      - disk.device.write.requests_cmaui_1c1_main
+      disk.read.requests_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.read.requests_pd_server_main_1b
       disk.allocation_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_nested2_1c1_cmaui_2
       disk.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_nested2_1c1_cmaui_1
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.bytes_pd_server_pattern4_port_01
       network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
       disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_nested2_1c1_cmaui_1
-      disk.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       network.outgoing.bytes.rate_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_pd_server_nested2_1b_port
       disk.write.requests_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_nested2_ps_1b
+      disk.write.requests_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.write.requests_pd_server_main_1b
       disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_nested2_ps_1b
@@ -865,48 +844,60 @@ topology_template:
       network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_pd_server_nested2_1b_port
+      disk.latency_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.latency_ps_server_main_1b
       os_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - os_server_nested2_pd_1b
-      network.incoming.packets_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.incoming.packets_cmaui_1c1_main_cmaui_port
-      memory.resident_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - memory.resident_pd_server_main_1b
       disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.incoming.packets_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.incoming.packets_cmaui_1c1_main_cmaui_port
+      disk.read.bytes_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.read.bytes_pd_server_main_1b
       disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.write.requests_server_pd_pattern4
-      disk.allocation_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.allocation_ps_server_main_1b
       disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_nested2_pd_1b
-      disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      memory.usage_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - memory.usage_pd_server_main_1b
+      - cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.write.requests.rate_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.write.requests.rate_ps_server_main_1b
+      disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.device.latency_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_nested2_1c1_cmaui_2
       network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_ps_server_nested2_1b_port
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - feature_pd_server_pattern4_port_02
       network.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_2
-      disk.device.read.requests_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.read.requests_ps_server_main_1b
+      network.outgoing.bytes_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
+      endpoint_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - endpoint_pd_server_main_1b
+      disk.allocation_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.allocation_cmaui_1c1_main
+      disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      network.outgoing.bytes_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
       vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2
@@ -919,6 +910,9 @@ topology_template:
       network.incoming.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_pd_server_nested2_1b_port
+      endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1
@@ -928,81 +922,93 @@ topology_template:
       disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_nested2_1c1_cmaui_1
-      disk.write.bytes.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.write.bytes.rate_pd_server_main_1b
-      disk.device.read.requests.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.read.requests.rate_pd_server_main_1b
       network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       scalable_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - scalable_server_nested2_pd_1b
-      network.outgoing.packets.rate_ps_server_main_1b_port:
+      network.incoming.packets_ps_server_main_1b_port_1:
       - abstract_ps_server_main_1b
-      - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port
-      disk.device.write.bytes.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.write.bytes.rate_ps_server_main_1b
-      memory_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - memory_ps_server_main_1b
-      network.outgoing.bytes.rate_cmaui_port_2:
+      - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      network.incoming.packets.rate_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
+      disk.device.usage_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
+      - disk.device.usage_cmaui_1c1_main
       disk.capacity_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_nested2_ps_1b
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
+      binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      host_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - host_ps_server_main_1b
+      disk.root.size_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.root.size_pd_server_main_1b
+      memory.usage_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - memory.usage_ps_server_main_1b
       network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_ps_server_nested2_1b_port
+      instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       os_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - os_server_nested2_ps_1b
-      disk.read.bytes.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.read.bytes.rate_pd_server_main_1b
-      disk.device.write.requests_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.write.requests_pd_server_main_1b
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      scalable_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - scalable_ps_server_main_1b
+      disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
+      - disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.capacity_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.capacity_cmaui_1c1_main
       disk.device.read.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_nested2_1c1_cmaui_2
-      disk.device.write.requests_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.requests_cmaui_1c1_main
-      disk.device.write.requests_server_main_1c1_cmaui_2:
+      host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      memory.resident_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - memory.resident_ps_server_main_1b
+      os_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - os_pd_server_main_1b
+      disk.device.read.bytes_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.device.write.requests_cmaui_1c1_main
+      - disk.device.read.bytes_cmaui_1c1_main
       disk.latency_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_nested2_ps_1b
       disk.root.size_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.root.size_server_nested2_1c1_cmaui_2
-      disk.device.usage_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.usage_pd_server_main_1b
       binding_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - binding_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.outgoing.bytes_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port
-      instance_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - instance_ps_server_main_1b
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outgoing.bytes_pd_server_pattern4_port_01
       memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_nested2_1c1_cmaui_1
@@ -1015,177 +1021,168 @@ topology_template:
       network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.write.requests_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.write.requests_ps_server_main_1b
+      memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
+      - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.allocation_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.allocation_cmaui_1c1_main
       feature_jsa_security_group1_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_jsa_security_group1_test_nested3Level
+      disk.device.read.requests_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.read.requests_ps_server_main_1b
       network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
-      disk.root.size_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.root.size_pd_server_main_1b
-      memory_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - memory_cmaui_1c1_main
-      memory_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - memory_cmaui_1c1_main
-      disk.device.write.bytes_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.write.bytes_pd_server_main_1b
       disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
-      disk.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      disk.device.read.bytes_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.bytes_cmaui_1c1_main
       disk.capacity_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_nested2_1c1_cmaui_1
-      disk.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.write.requests.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.write.requests.rate_cmaui_1c1_main
+      disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      - disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.allocation_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.allocation_cmaui_1c1_main
       disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_nested2_pd_1b
+      disk.device.allocation_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.allocation_cmaui_1c1_main
+      disk.capacity_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.capacity_ps_server_main_1b
       binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
       disk.read.requests_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_nested2_ps_1b
+      cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.read.bytes_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes_server_nested2_ps_1b
-      network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       scalable_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - scalable_server_pd_pattern4
       disk.device.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.latency_server_pd_pattern4
-      network.outgoing.packets.rate_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port
-      disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      disk.write.requests.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.write.requests.rate_cmaui_1c1_main
+      scalable_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - scalable_cmaui_1c1_main
       disk.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_nested2_1c1_cmaui_2
+      disk.device.write.requests_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.requests_cmaui_1c1_main
       disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests_server_nested2_1c1_cmaui_1
-      cpu_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - cpu_cmaui_1c1_main
-      cpu_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - cpu_cmaui_1c1_main
       instance_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - instance_server_pd_pattern4
-      disk.read.requests_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.read.requests_ps_server_main_1b
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - binding_pd_server_pattern4_port_2
-      scalable_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - scalable_cmaui_1c1_main
       disk.allocation_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_nested2_pd_1b
-      scalable_server_main_1c1_cmaui_1:
+      feature_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - scalable_cmaui_1c1_main
+      - feature_cmaui_1c1_main
       disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_nested2_1c1_cmaui_2
-      disk.write.bytes_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.write.bytes_pd_server_main_1b
-      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      network.incoming.bytes.rate_cmaui_port_1:
+      disk.device.capacity_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
-      network.incoming.bytes.rate_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
-      disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - disk.device.capacity_cmaui_1c1_main
       scalable_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - scalable_server_pd_pattern4_test_nested_pattern_4_nested2
+      disk.write.bytes.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.write.bytes.rate_pd_server_main_1b
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
-      cpu_util_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - cpu_util_pd_server_main_1b
-      scalable_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
       disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2
+      disk.iops_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.iops_pd_server_main_1b
+      disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.ephemeral.size_server_nested2_1c1_cmaui_2
-      network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.bytes.rate_pd_server_pattern4_port_1
-      vcpus_server_main_pd_1b:
+      feature_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - vcpus_pd_server_main_1b
-      host_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - host_pd_server_main_1b
+      - feature_pd_server_main_1b
+      network.incoming.bytes_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.incoming.bytes_cmaui_1c1_main_cmaui_port
+      network.incoming.bytes_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.incoming.bytes_cmaui_1c1_main_cmaui_port
+      scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.latency_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_nested2_pd_1b
-      scalable_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - scalable_ps_server_main_1b
+      memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      cpu.delta_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - cpu.delta_cmaui_1c1_main
       disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.write.requests.rate_server_pd_pattern4
       disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.write.requests_server_pd_pattern4
+      disk.device.write.bytes_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.bytes_cmaui_1c1_main
       disk.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_nested2_1c1_cmaui_2
       cpu_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - cpu_server_nested2_pd_1b
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outgoing.packets.rate_pd_server_pattern4_port_01
       disk.device.allocation_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_nested2_1c1_cmaui_2
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - feature_pd_server_pattern4_port_1
+      disk.device.allocation_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.allocation_pd_server_main_1b
       disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.read.bytes_server_pd_pattern4
@@ -1198,24 +1195,27 @@ topology_template:
       network.incoming.bytes_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_1
-      feature_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - feature_pd_server_main_1b
+      disk.device.latency_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.latency_cmaui_1c1_main
       disk.device.allocation_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_nested2_1c1_cmaui_1
-      network.outgoing.bytes_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
-      network.outgoing.bytes_cmaui_port_1:
+      vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      cpu_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
-      disk.device.write.requests.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.write.requests.rate_ps_server_main_1b
+      - cpu_cmaui_1c1_main
       endpoint_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - endpoint_server_nested2_1c1_cmaui_2
+      disk.write.bytes.rate_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.write.bytes.rate_ps_server_main_1b
+      disk.device.read.requests.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.read.requests.rate_pd_server_main_1b
       feature_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - feature
@@ -1225,24 +1225,33 @@ topology_template:
       disk.device.write.bytes_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_nested2_pd_1b
-      disk.device.iops_server_main_ps_1b:
+      disk.device.capacity_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - disk.device.iops_ps_server_main_1b
+      - disk.device.capacity_ps_server_main_1b
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.packets.rate_pd_server_pattern4_port_01
+      disk.device.write.bytes_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.bytes_cmaui_1c1_main
       network.incoming.bytes_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_2
-      disk.device.write.bytes_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.write.bytes_ps_server_main_1b
+      binding_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - binding_pd_server_main_1b_pd_server_main_1b_port
       disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.write.bytes_server_pd_pattern4
-      binding_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - binding_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
       disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2
+      memory.resident_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - memory.resident_pd_server_main_1b
+      network.incoming.bytes_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port
       vcpus_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - vcpus_server_nested2_1c1_cmaui_1
@@ -1255,9 +1264,6 @@ topology_template:
       disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_nested2_ps_1b
-      network.incoming.bytes_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port
       endpoint_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - endpoint_server_nested2_1c1_cmaui_1
@@ -1267,21 +1273,27 @@ topology_template:
       disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.iops_server_pd_pattern4
-      disk.read.bytes_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.read.bytes_pd_server_main_1b
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      disk.write.bytes.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.write.bytes.rate_cmaui_1c1_main
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.device.read.requests_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests_server_nested2_pd_1b
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - attachment_pd_server_pattern4_port_02
       memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - memory.resident_server_pd_pattern4
+      feature_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - feature_pd_server_main_1b_pd_server_main_1b_port
+      host_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - host_cmaui_1c1_main
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.ephemeral.size_server_nested2_ps_1b
@@ -1291,18 +1303,15 @@ topology_template:
       network.outgoing.bytes_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_pd_server_nested2_1b_port
-      disk.write.bytes.rate_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.write.bytes.rate_cmaui_1c1_main
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes.rate_server_nested2_ps_1b
-      disk.device.allocation_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.allocation_cmaui_1c1_main
-      disk.device.allocation_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.allocation_cmaui_1c1_main
+      disk.device.usage_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.usage_ps_server_main_1b
       network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
@@ -1312,12 +1321,6 @@ topology_template:
       disk.device.write.requests_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests_server_nested2_pd_1b
-      disk.capacity_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.capacity_ps_server_main_1b
-      cpu.delta_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - cpu.delta_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_nested2_1c1_cmaui_2
@@ -1327,24 +1330,33 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_2
+      disk.device.latency_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.latency_cmaui_1c1_main
       disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
+      network.incoming.packets.rate_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
+      network.incoming.packets.rate_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
       disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_nested2_pd_1b
-      disk.device.latency_server_main_ps_1b:
+      disk.device.allocation_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - disk.device.latency_ps_server_main_1b
-      disk.device.read.bytes_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.bytes_cmaui_1c1_main
-      disk.device.read.bytes_server_main_1c1_cmaui_2:
+      - disk.device.allocation_ps_server_main_1b
+      vcpus_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.device.read.bytes_cmaui_1c1_main
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      - vcpus_cmaui_1c1_main
+      attachment_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - attachment_pd_server_main_1b_pd_server_main_1b_port
+      disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      - disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       network.incoming.bytes.rate_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_1
@@ -1354,81 +1366,54 @@ topology_template:
       disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
-      cpu.delta_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - cpu.delta_cmaui_1c1_main
-      cpu.delta_server_main_1c1_cmaui_2:
+      memory.resident_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - cpu.delta_cmaui_1c1_main
+      - memory.resident_cmaui_1c1_main
       network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_pd_server_nested2_1b_port
-      binding_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - binding_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      network.outpoing.packets_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.outpoing.packets_cmaui_1c1_main_cmaui_port
       binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outpoing.packets_pd_server_pattern4_port_1
-      feature_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - feature_cmaui_1c1_main_cmaui_port
-      feature_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_12:
       - abstract_cmaui_1c1_main
-      - feature_cmaui_1c1_main_cmaui_port
-      endpoint_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - network.outpoing.packets_cmaui_1c1_main_cmaui_port
       disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.usage_server_pd_pattern4
-      disk.device.read.bytes.rate_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.bytes.rate_cmaui_1c1_main
-      disk.usage_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.usage_ps_server_main_1b
-      disk.device.read.bytes.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.bytes.rate_cmaui_1c1_main
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_2
-      disk.device.usage_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.usage_cmaui_1c1_main
-      disk.device.usage_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.usage_cmaui_1c1_main
       memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_nested2_1c1_cmaui_2
       disk.capacity_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_nested2_pd_1b
-      memory_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - memory_pd_server_main_1b
+      disk.ephemeral.size_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.ephemeral.size_cmaui_1c1_main
       cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - cpu_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.outpoing.packets_pd_server_main_1b_port:
+      binding_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port
-      network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outpoing.packets_pd_server_pattern4_port_2
-      disk.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      cpu.delta_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - cpu.delta_ps_server_main_1b
-      disk.allocation_server_main_1c1_cmaui_1:
+      - binding_pd_server_main_1b
+      memory.resident_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.allocation_cmaui_1c1_main
+      - memory.resident_cmaui_1c1_main
+      disk.device.read.requests.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.requests.rate_cmaui_1c1_main
+      disk.device.capacity_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.capacity_pd_server_main_1b
+      disk.read.bytes_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.read.bytes_cmaui_1c1_main
       os_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - os_server_pd_pattern4_test_nested_pattern_4_nested2
@@ -1438,51 +1423,51 @@ topology_template:
       host_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - host_server_nested2_ps_1b
-      disk.allocation_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.allocation_cmaui_1c1_main
       host_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - host_server_pd_pattern4_test_nested_pattern_4_nested2
       cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - cpu_util_server_nested2_1c1_cmaui_1
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - attachment_pd_server_pattern4_port_1
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
       network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
+      disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      disk.root.size_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.root.size_cmaui_1c1_main
+      disk.usage_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.usage_ps_server_main_1b
+      cpu_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - cpu_pd_server_main_1b
+      disk.read.requests_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.read.requests_cmaui_1c1_main
       memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_pd_server_nested2_1b_port
       disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.read.requests.rate_server_pd_pattern4
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.packets.rate_pd_server_pattern4_port_1
-      binding_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - binding_pd_server_main_1b
-      disk.device.read.bytes_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.read.bytes_ps_server_main_1b
+      disk.ephemeral.size_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.ephemeral.size_cmaui_1c1_main
+      host_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - host_cmaui_1c1_main
+      disk.device.iops_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.iops_cmaui_1c1_main
       disk.device.latency_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_nested2_ps_1b
@@ -1492,12 +1477,24 @@ topology_template:
       cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - cpu_util_server_nested2_1c1_cmaui_2
+      instance_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - instance_cmaui_1c1_main
       memory_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - memory_server_nested2_1c1_cmaui_2
-      attachment_ps_server_main_1b_port:
+      disk.device.read.requests.rate_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - attachment_ps_server_main_1b_ps_server_main_1b_port
+      - disk.device.read.requests.rate_ps_server_main_1b
+      disk.device.read.requests.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.requests.rate_cmaui_1c1_main
+      disk.read.bytes_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.read.bytes_cmaui_1c1_main
+      network.outpoing.packets_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port
       disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_nested2_pd_1b
@@ -1507,6 +1504,12 @@ topology_template:
       endpoint_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - endpoint_server_nested2_ps_1b
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.packets_pd_server_pattern4_port_01
       disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2
@@ -1516,21 +1519,18 @@ topology_template:
       disk.device.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_nested2_ps_1b
-      disk.write.requests_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.write.requests_pd_server_main_1b
       feature_jsa_security_group1_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - feature_jsa_security_group1_test_resourceGroup
-      network.outgoing.bytes.rate_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
-      cpu_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - cpu_ps_server_main_1b
       disk.device.usage_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.usage_server_nested2_ps_1b
+      disk.ephemeral.size_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.ephemeral.size_pd_server_main_1b
+      disk.root.size_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.root.size_cmaui_1c1_main
       disk.iops_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_nested2_1c1_cmaui_2
@@ -1546,174 +1546,216 @@ topology_template:
       disk.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.allocation_server_pd_pattern4
-      disk.write.requests.rate_server_main_1c1_cmaui_1:
+      cpu_util_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.write.requests.rate_cmaui_1c1_main
-      disk.write.requests.rate_server_main_1c1_cmaui_2:
+      - cpu_util_cmaui_1c1_main
+      disk.device.write.requests.rate_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.write.requests.rate_cmaui_1c1_main
-      disk.latency_server_main_ps_1b:
+      - disk.device.write.requests.rate_cmaui_1c1_main
+      network.outgoing.bytes.rate_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
+      instance_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - instance_cmaui_1c1_main
+      network.outgoing.packets.rate_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port
+      disk.device.iops_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.iops_cmaui_1c1_main
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.bytes.rate_pd_server_pattern4_port_01
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.incoming.packets_pd_server_pattern4_port_02
+      disk.write.requests.rate_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - disk.latency_ps_server_main_1b
+      - disk.write.requests.rate_ps_server_main_1b
       disk.allocation_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_nested2_ps_1b
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       network.outpoing.packets_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_2
-      disk.device.write.bytes.rate_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.write.bytes.rate_pd_server_main_1b
+      cpu.delta_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - cpu.delta_cmaui_1c1_main
       network.outgoing.bytes_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_1
       feature_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - feature_server_nested2_ps_1b
-      disk.device.capacity_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.capacity_pd_server_main_1b
-      network.outpoing.packets_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.outpoing.packets_cmaui_1c1_main_cmaui_port
-      network.outpoing.packets_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.outpoing.packets_cmaui_1c1_main_cmaui_port
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_01
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       vcpus_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - vcpus_server_nested2_1c1_cmaui_2
       disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2
-      disk.device.allocation_server_main_ps_1b:
+      disk.device.read.bytes.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.read.bytes.rate_cmaui_1c1_main
+      disk.device.write.requests.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.requests.rate_cmaui_1c1_main
+      disk.iops_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - disk.device.allocation_ps_server_main_1b
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.packets.rate_pd_server_pattern4_port_1
+      - disk.iops_ps_server_main_1b
       disk.device.iops_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_nested2_pd_1b
       endpoint_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - endpoint_server_pd_pattern4
+      cpu_util_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - cpu_util_cmaui_1c1_main
       disk.device.allocation_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_nested2_pd_1b
       disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
-      os_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - os_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_ps_server_nested2_1b_port
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - binding_pd_server_pattern4_port_01
+      network.incoming.packets_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.incoming.packets_cmaui_1c1_main_cmaui_port
+      network.incoming.packets_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.incoming.packets_cmaui_1c1_main_cmaui_port
+      network.incoming.bytes.rate_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
       disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_nested2_1c1_cmaui_1
+      cpu_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - cpu_cmaui_1c1_main
       disk.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_nested2_1c1_cmaui_2
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - network.outpoing.packets_pd_server_pattern4_port_02
       vcpus_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - vcpus_server_pd_pattern4
       host_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - host_server_nested2_1c1_cmaui_1
-      disk.read.bytes.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.read.bytes.rate_ps_server_main_1b
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
+      disk.write.requests_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.write.requests_cmaui_1c1_main
+      memory.usage_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - memory.usage_cmaui_1c1_main
       memory_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - memory_server_nested2_ps_1b
+      endpoint_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - endpoint_ps_server_main_1b
       network.outpoing.packets_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_1
+      feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.iops_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_nested2_pd_1b
-      disk.ephemeral.size_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.ephemeral.size_cmaui_1c1_main
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
       disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.read.bytes.rate_server_pd_pattern4
-      disk.device.read.requests.rate_server_main_1c1_cmaui_2:
+      disk.capacity_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - disk.device.read.requests.rate_cmaui_1c1_main
-      disk.device.read.requests.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.requests.rate_cmaui_1c1_main
-      disk.device.usage_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.usage_ps_server_main_1b
-      instance_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - instance_pd_server_main_1b
+      - disk.capacity_cmaui_1c1_main
       instance_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - instance_server_nested2_ps_1b
       disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      disk.read.requests_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.read.requests_ps_server_main_1b
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
-      memory.resident_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.ephemeral.size_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.ephemeral.size_cmaui_1c1_main
-      disk.capacity_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.capacity_cmaui_1c1_main
+      - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      network.outgoing.bytes_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port
       disk.device.iops_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.iops_server_nested2_ps_1b
       disk.read.requests_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_nested2_pd_1b
+      cpu.delta_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - cpu.delta_pd_server_main_1b
       disk.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.capacity_server_pd_pattern4
-      disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      network.outgoing.bytes_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port
       instance_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - instance_server_nested2_1c1_cmaui_1
       feature_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - feature_test_nested_pattern_4_nested2
-      endpoint_server_main_1c1_cmaui_2:
+      memory_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
-      - endpoint_cmaui_1c1_main
-      endpoint_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - endpoint_cmaui_1c1_main
+      - memory_cmaui_1c1_main
+      disk.write.bytes_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.write.bytes_ps_server_main_1b
+      disk.write.requests.rate_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.write.requests.rate_pd_server_main_1b
       cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2
       attachment_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_1
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.outgoing.bytes_pd_server_pattern4_port_1
-      feature_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - feature_pd_server_main_1b_pd_server_main_1b_port
+      binding_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - binding_ps_server_main_1b
+      disk.capacity_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.capacity_cmaui_1c1_main
       disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.write.requests.rate_server_pd_pattern4
+      os_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - os_cmaui_1c1_main
       disk.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_nested2_1c1_cmaui_1
@@ -1726,96 +1768,129 @@ topology_template:
       disk.device.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_nested2_1c1_cmaui_1
-      disk.root.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
       network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_1
-      disk.device.read.bytes.rate_server_main_pd_1b:
+      disk.device.iops_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.device.iops_ps_server_main_1b
+      disk.write.bytes_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - disk.device.read.bytes.rate_pd_server_main_1b
+      - disk.write.bytes_pd_server_main_1b
+      disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       binding_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - binding_server_nested2_1c1_cmaui_1
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      memory_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - memory_cmaui_1c1_main
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
-      - network.incoming.packets_pd_server_pattern4_port_1
+      - attachment_pd_server_pattern4_port_01
       disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes.rate_server_nested2_ps_1b
       disk.device.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_nested2_1c1_cmaui_1
-      cpu_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - cpu_pd_server_main_1b
       feature_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - feature_server_nested2_1c1_cmaui_1
-      network.incoming.packets.rate_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port
       disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2
+      disk.read.bytes.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.read.bytes.rate_cmaui_1c1_main
       attachment_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_2
-      disk.device.allocation_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - disk.device.allocation_pd_server_main_1b
+      disk.device.write.bytes.rate_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.bytes.rate_cmaui_1c1_main
       endpoint_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - endpoint_server_nested2_pd_1b
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - feature_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
+      memory_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - memory_pd_server_main_1b
+      network.incoming.bytes.rate_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
+      disk.device.read.requests_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.device.read.requests_pd_server_main_1b
+      disk.read.requests_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.read.requests_cmaui_1c1_main
       disk.device.capacity_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.capacity_server_nested2_pd_1b
-      network.incoming.bytes.rate_pd_server_main_1b_port:
+      feature_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - feature_cmaui_1c1_main_cmaui_port
+      feature_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - feature_cmaui_1c1_main_cmaui_port
+      network.incoming.bytes.rate_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
+      network.incoming.bytes.rate_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
+      disk.device.iops_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
+      - disk.device.iops_pd_server_main_1b
+      os_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - os_cmaui_1c1_main
       disk.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.latency_server_pd_pattern4
-      vcpus_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - vcpus_cmaui_1c1_main
       memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2
-      vcpus_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - vcpus_cmaui_1c1_main
       disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2
       attachment_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - attachment_pd_server_nested2_1b_port
+      disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       feature_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_2
-      disk.latency_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.latency_cmaui_1c1_main
       disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.bytes_server_nested2_ps_1b
-      disk.latency_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.latency_cmaui_1c1_main
+      cpu_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - cpu_ps_server_main_1b
+      scalable_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - scalable_pd_server_main_1b
       memory.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - memory.usage_server_nested2_1c1_cmaui_2
+      memory.usage_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - memory.usage_cmaui_1c1_main
+      disk.read.bytes.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.read.bytes.rate_cmaui_1c1_main
       network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
+      disk.write.requests_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.write.requests_cmaui_1c1_main
+      disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       cpu_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - cpu_server_nested2_1c1_cmaui_1
@@ -1825,90 +1900,72 @@ topology_template:
       disk.device.read.bytes_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes_server_nested2_ps_1b
+      disk.device.write.bytes.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.device.write.bytes.rate_cmaui_1c1_main
       feature_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - feature_pd_server_nested2_1b_port
-      network.incoming.packets_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       binding_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_2
-      binding_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - binding_pd_server_main_1b_pd_server_main_1b_port
-      binding_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - binding_cmaui_1c1_main
+      memory_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - memory_ps_server_main_1b
+      disk.read.bytes_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.read.bytes_ps_server_main_1b
+      vcpus_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - vcpus_ps_server_main_1b
       instance_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - instance_server_nested2_pd_1b
-      binding_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - binding_cmaui_1c1_main
-      feature_server_main_ps_1b:
+      disk.device.read.bytes_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - feature_ps_server_main_1b
-      memory_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - memory_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      - disk.device.read.bytes_ps_server_main_1b
       disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.read.requests_server_pd_pattern4
+      disk.write.bytes.rate_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - disk.write.bytes.rate_cmaui_1c1_main
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2
-      disk.device.write.bytes_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.bytes_cmaui_1c1_main
       feature_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - feature_server_pd_pattern4
-      disk.device.write.bytes_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.bytes_cmaui_1c1_main
       scalable_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - scalable_server_nested2_1c1_cmaui_2
-      network.incoming.packets_pd_server_main_1b_port:
+      disk.device.usage_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port
+      - disk.device.usage_pd_server_main_1b
       memory_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - memory_server_nested2_pd_1b
       binding_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - binding_pd_server_nested2_1b_port
-      host_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - host_ps_server_main_1b
       feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      endpoint_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - endpoint_ps_server_main_1b
       network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
-      disk.root.size_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.root.size_cmaui_1c1_main
-      disk.root.size_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.root.size_cmaui_1c1_main
-      disk.write.bytes_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.write.bytes_cmaui_1c1_main
-      vcpus_server_main_ps_1b:
+      disk.device.write.bytes_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - vcpus_ps_server_main_1b
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - attachment_pd_server_pattern4_port_2
-      attachment_cmaui_port_2:
+      - disk.device.write.bytes_ps_server_main_1b
+      vcpus_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - attachment_cmaui_1c1_main_cmaui_port
+      - vcpus_cmaui_1c1_main
       network.incoming.packets_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_ps_server_nested2_1b_port
@@ -1921,30 +1978,18 @@ topology_template:
       disk.write.requests_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_nested2_pd_1b
-      network.outgoing.packets.rate_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
       memory.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - memory.usage_server_pd_pattern4
-      network.outgoing.packets.rate_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
       disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_nested2_pd_1b
-      attachment_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - attachment_cmaui_1c1_main_cmaui_port
-      disk.device.write.bytes.rate_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.write.bytes.rate_cmaui_1c1_main
-      os_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - os_ps_server_main_1b
-      disk.device.write.bytes.rate_server_main_1c1_cmaui_2:
+      disk.usage_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.usage_pd_server_main_1b
+      disk.write.bytes.rate_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - disk.device.write.bytes.rate_cmaui_1c1_main
+      - disk.write.bytes.rate_cmaui_1c1_main
       binding_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - binding_ps_server_nested2_1b_port
@@ -1954,30 +1999,18 @@ topology_template:
       scalable_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - scalable_server_nested2_ps_1b
-      disk.write.bytes_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.write.bytes_cmaui_1c1_main
-      disk.ephemeral.size_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.ephemeral.size_ps_server_main_1b
-      disk.write.bytes_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.write.bytes_ps_server_main_1b
+      disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       memory_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - memory_server_nested2_1c1_cmaui_1
       network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.bytes_pd_server_pattern4_port_2
       disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2
-      network.incoming.bytes_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port
       scalable_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - scalable_server_nested2_1c1_cmaui_1
@@ -1990,18 +2023,6 @@ topology_template:
       disk.iops_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.iops_server_nested2_ps_1b
-      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      cpu_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - cpu_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      host_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - host_cmaui_1c1_main
-      host_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - host_cmaui_1c1_main
       memory.resident_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - memory.resident_server_nested2_ps_1b
@@ -2014,30 +2035,24 @@ topology_template:
       disk.device.allocation_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.allocation_server_nested2_ps_1b
-      disk.write.requests.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.write.requests.rate_ps_server_main_1b
       attachment_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - attachment_ps_server_nested2_1b_port
       disk.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.read.requests_server_nested2_1c1_cmaui_1
-      disk.device.latency_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.device.latency_cmaui_1c1_main
-      disk.iops_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.iops_cmaui_1c1_main
-      disk.device.latency_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.device.latency_cmaui_1c1_main
-      disk.iops_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.iops_cmaui_1c1_main
-      memory.usage_server_main_ps_1b:
+      disk.device.write.requests_server_main_ps_1b_1:
       - abstract_ps_server_main_1b
-      - memory.usage_ps_server_main_1b
+      - disk.device.write.requests_ps_server_main_1b
+      disk.allocation_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - disk.allocation_ps_server_main_1b
+      disk.latency_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - disk.latency_pd_server_main_1b
+      disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       disk.device.capacity_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.device.capacity_server_nested2_1c1_cmaui_1
@@ -2047,39 +2062,30 @@ topology_template:
       disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - disk.device.write.bytes.rate_server_pd_pattern4
-      network.incoming.packets.rate_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port
       disk.device.latency_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_nested2_pd_1b
-      disk.write.bytes.rate_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.write.bytes.rate_ps_server_main_1b
-      disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      disk.capacity_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.capacity_cmaui_1c1_main
       endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - endpoint_server_pd_pattern4_test_nested_pattern_4_nested2
       disk.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - disk.write.requests_server_nested2_1c1_cmaui_1
-      disk.read.bytes_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - disk.read.bytes_cmaui_1c1_main
-      disk.device.write.requests_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.device.write.requests_ps_server_main_1b
-      disk.read.bytes_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - disk.read.bytes_cmaui_1c1_main
       disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
+      network.outgoing.packets.rate_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
+      binding_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - binding_cmaui_1c1_main_cmaui_port
+      network.outgoing.packets.rate_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
+      binding_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - binding_cmaui_1c1_main_cmaui_port
       network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
@@ -2092,36 +2098,30 @@ topology_template:
       disk.write.requests.rate_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_nested2_ps_1b
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.packets_pd_server_pattern4_port_2
-      binding_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - binding_ps_server_main_1b_ps_server_main_1b_port
+      attachment_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - attachment_cmaui_1c1_main_cmaui_port
+      attachment_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - attachment_cmaui_1c1_main_cmaui_port
       feature_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - feature_test_resourceGroup
-      disk.root.size_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.root.size_ps_server_main_1b
-      disk.iops_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - disk.iops_ps_server_main_1b
       disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2
-      memory.resident_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - memory.resident_ps_server_main_1b
       feature_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_1
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - network.incoming.bytes_pd_server_pattern4_port_1
+      disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_nested2_1c1_cmaui_1
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       network.incoming.packets_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_1
@@ -2132,87 +2132,66 @@ topology_template:
       dependency_jsa_security_group2_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - dependency_jsa_security_group2_test_resourceGroup
-      dependency_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - dependency_pd_server_main_1b_pd_server_main_1b_port
+      link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - link_pd_server_pattern4_port_01
       dependency_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_2
-      dependency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
-      link_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - link_pd_server_pattern4_port_2
       dependency_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - dependency_server_nested2_1c1_cmaui_1
-      dependency_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - dependency_pd_server_main_1b
       port_jsa_security_group1_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - port_jsa_security_group1_test_nested3Level
+      link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - link_pd_server_pattern4_port_02
       dependency_test_nested2Level:
       - test_nested2Level
       - dependency
-      local_storage_server_main_pd_1b:
+      dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - dependency_pd_server_pattern4_port_02
+      local_storage_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - local_storage_ps_server_main_1b
+      dependency_cmaui_port_11:
+      - abstract_cmaui_1c1_main
+      - dependency_cmaui_1c1_main_cmaui_port
+      dependency_server_main_pd_1b_1:
       - abstract_pd_server_main_1b
-      - local_storage_pd_server_main_1b
-      dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
-      link_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - link_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
-      dependency_server_main_1c1_cmaui_2:
+      - dependency_pd_server_main_1b
+      dependency_server_main_1c1_cmaui_21:
       - abstract_cmaui_1c1_main
       - dependency_cmaui_1c1_main
+      dependency_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - dependency_cmaui_1c1_main_cmaui_port
+      dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+      - test_nested_pattern_4_main_1
+      - dependency_pd_server_pattern4_port_01
       local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2
-      dependency_cmaui_port_1:
-      - abstract_cmaui_1c1_main
-      - dependency_cmaui_1c1_main_cmaui_port
-      local_storage_server_main_1c1_cmaui_2:
-      - abstract_cmaui_1c1_main
-      - local_storage_cmaui_1c1_main
       local_storage_server_nested2_1c1_cmaui_2_test_nested2Level:
       - test_nested2Level
       - local_storage_server_nested2_1c1_cmaui_2
-      dependency_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - dependency_ps_server_main_1b_ps_server_main_1b_port
-      dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-      - test_nested2Level
-      - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2
       local_storage_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - local_storage_server_nested2_pd_1b
-      local_storage_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - local_storage_cmaui_1c1_main
-      dependency_cmaui_port_2:
-      - abstract_cmaui_1c1_main
-      - dependency_cmaui_1c1_main_cmaui_port
       local_storage_server_nested2_1c1_cmaui_1_test_nested2Level:
       - test_nested2Level
       - local_storage_server_nested2_1c1_cmaui_1
-      local_storage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file
+      local_storage_server_main_pd_1b_1:
+      - abstract_pd_server_main_1b
+      - local_storage_pd_server_main_1b
       dependency_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - dependency_test_resourceGroup
-      dependency_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - dependency_pd_server_pattern4_port_1
-      dependency_server_main_1c1_cmaui_1:
-      - abstract_cmaui_1c1_main
-      - dependency_cmaui_1c1_main
-      link_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
-      - link_pd_server_pattern4_port_1_test_nested_pattern_4_nested2
+      - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       dependency_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - dependency_pd_server_nested2_1b_port
@@ -2222,33 +2201,36 @@ topology_template:
       link_pd_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - link_pd_server_nested2_1b_port
-      local_storage_server_main_ps_1b:
-      - abstract_ps_server_main_1b
-      - local_storage_ps_server_main_1b
       dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
       dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
       - test_nested2Level
       - dependency_server_pd_pattern4_test_nested_pattern_4_nested2
-      link_ps_server_main_1b_port:
-      - abstract_ps_server_main_1b
-      - link_ps_server_main_1b_ps_server_main_1b_port
       dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
+      local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
+      link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
       dependency_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_1
-      link_pd_server_main_1b_port:
-      - abstract_pd_server_main_1b
-      - link_pd_server_main_1b_pd_server_main_1b_port
       local_storage_server_pd_pattern4_test_nested_pattern_4_main_1:
       - test_nested_pattern_4_main_1
       - local_storage_server_pd_pattern4
+      dependency_server_main_ps_1b_1:
+      - abstract_ps_server_main_1b
+      - dependency_ps_server_main_1b
       dependency_server_nested2_pd_1b_test_nested2Level:
       - test_nested2Level
       - dependency_server_nested2_pd_1b
+      dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
       dependency_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - dependency_server_nested2_ps_1b
@@ -2258,24 +2240,39 @@ topology_template:
       link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
-      link_cmaui_port_2:
+      local_storage_server_main_1c1_cmaui_11:
       - abstract_cmaui_1c1_main
-      - link_cmaui_1c1_main_cmaui_port
-      link_cmaui_port_1:
+      - local_storage_cmaui_1c1_main
+      dependency_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - dependency_pd_server_main_1b_pd_server_main_1b_port
+      link_cmaui_port_11:
       - abstract_cmaui_1c1_main
       - link_cmaui_1c1_main_cmaui_port
+      dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
+      link_ps_server_main_1b_port_1:
+      - abstract_ps_server_main_1b
+      - link_ps_server_main_1b_ps_server_main_1b_port
       dependency_jsa_security_group1_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - dependency_jsa_security_group1_test_resourceGroup
+      dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
+      - test_nested2Level
+      - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
       link_cmaui_port_2_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_2
+      link_cmaui_port_12:
+      - abstract_cmaui_1c1_main
+      - link_cmaui_1c1_main_cmaui_port
       dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested_pattern_4_same_type_diff_file
-      dependency_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - dependency_pd_server_pattern4_port_2
+      link_pd_server_main_1b_port_1:
+      - abstract_pd_server_main_1b
+      - link_pd_server_main_1b_pd_server_main_1b_port
       link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
       - test_nested2Level
       - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
@@ -2297,6 +2294,9 @@ topology_template:
       link_cmaui_port_1_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_1
+      local_storage_server_main_1c1_cmaui_21:
+      - abstract_cmaui_1c1_main
+      - local_storage_cmaui_1c1_main
       local_storage_server_nested2_ps_1b_test_nested2Level:
       - test_nested2Level
       - local_storage_server_nested2_ps_1b
@@ -2306,12 +2306,12 @@ topology_template:
       link_ps_server_nested2_1b_port_test_nested2Level:
       - test_nested2Level
       - link_ps_server_nested2_1b_port
-      dependency_server_main_ps_1b:
+      dependency_server_main_1c1_cmaui_11:
+      - abstract_cmaui_1c1_main
+      - dependency_cmaui_1c1_main
+      dependency_ps_server_main_1b_port_1:
       - abstract_ps_server_main_1b
-      - dependency_ps_server_main_1b
-      link_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
-      - test_nested_pattern_4_main_1
-      - link_pd_server_pattern4_port_1
+      - dependency_ps_server_main_1b_ps_server_main_1b_port
       port_jsa_security_group1_test_resourceGroup_test_nested2Level:
       - test_nested2Level
       - port_jsa_security_group1_test_resourceGroup
@@ -2320,4 +2320,4 @@ topology_template:
       - dependency_test_nested_pattern_4_nested2
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_test_nested3Level
+      - 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/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
index c851f7f..326bdcf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml
@@ -153,19 +153,19 @@ topology_template:
           get_input: jsa_name
         service_template_filter:
           substitute_service_template: nested-pattern-4ServiceTemplate.yaml
-        port_pd_server_pattern4_port_1_ip_requirements:
+        port_pd_server_pattern4_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pd_server_pattern4_port_02_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pd_server_pattern4_port_1_mac_requirements:
+        port_pd_server_pattern4_port_02_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_server_pattern4_port_2_ip_requirements:
+        port_pd_server_pattern4_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
@@ -334,9 +334,9 @@ topology_template:
       disk.allocation_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.allocation_ps_server_nested2_1b
-      network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.packets_pd_server_pattern4_port_2
+      scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - scalable_server_pd_pattern4_1
       network.incoming.packets.rate_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port
@@ -361,9 +361,6 @@ topology_template:
       memory.usage_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - memory.usage_cmaui_1c1_nested2
-      instance_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - instance_server_pd_pattern4
       instance_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - instance_cmaui_1c1_nested2
@@ -376,12 +373,6 @@ topology_template:
       disk.read.bytes_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.read.bytes_pd_server_nested2_1b
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - cpu_util_server_pd_pattern4
-      disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.read.requests.rate_server_pd_pattern4
       network.outgoing.packets.rate_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
@@ -418,15 +409,18 @@ topology_template:
       network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.incoming.bytes.rate_pd_server_pattern4_port_1
-      disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.capacity_server_pd_pattern4
       disk.write.bytes.rate_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.write.bytes.rate_ps_server_nested2_1b
       network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.incoming.packets.rate_pd_server_pattern4_port_2
+      disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.write.requests_server_pd_pattern4_1
+      memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - memory.resident_server_pd_pattern4_1
       feature_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - feature
@@ -448,48 +442,57 @@ topology_template:
       binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - binding_pd_server_pattern4_port_1
+      attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - attachment_pd_server_pattern4_port_02
       disk.device.iops_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.iops_ps_server_nested2_1b
+      disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.ephemeral.size_server_pd_pattern4_1
+      disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.read.bytes.rate_server_pd_pattern4_1
+      os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - os_server_pd_pattern4_1
       cpu_util_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - cpu_util_pd_server_nested2_1b
+      network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.packets_pd_server_pattern4_port_01
       network.incoming.packets_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port
-      network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.bytes.rate_pd_server_pattern4_port_1
-      binding_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - binding_pd_server_pattern4_port_1
       disk.write.bytes.rate_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.write.bytes.rate_pd_server_nested2_1b
-      host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - host_server_pd_pattern4
+      network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.packets.rate_pd_server_pattern4_port_02
       disk.device.capacity_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.capacity_cmaui_1c1_nested2
       disk.device.capacity_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.capacity_cmaui_1c1_nested2
-      disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.ephemeral.size_server_pd_pattern4
+      binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - binding_pd_server_pattern4_port_02
       network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.outpoing.packets_pd_server_pattern4_port_1
+      disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.write.requests.rate_server_pd_pattern4_1
       disk.write.bytes_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.write.bytes_ps_server_nested2_1b
       disk.latency_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.latency_pd_server_nested2_1b
-      network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_1
       network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.incoming.packets_pd_server_pattern4_port_1
@@ -508,9 +511,6 @@ topology_template:
       disk.device.capacity_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.capacity_ps_server_nested2_1b
-      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.usage_server_pd_pattern4
       network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.outgoing.bytes.rate_pd_server_pattern4_port_1
@@ -523,27 +523,18 @@ topology_template:
       network.incoming.bytes_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port
-      disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.read.requests_server_pd_pattern4
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - feature_pd_server_pattern4_port_2
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_02
       feature_test_resourceGroup:
       - test_resourceGroup
       - feature
-      endpoint_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - endpoint_server_pd_pattern4
-      disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.read.bytes.rate_server_pd_pattern4
+      - disk.read.bytes_server_pd_pattern4_1
       network.incoming.bytes_cmaui_port_2:
       - abstract_cmaui_1c1_nested2
       - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.bytes_pd_server_pattern4_port_1
       disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.write.requests.rate_server_pd_pattern4
@@ -559,6 +550,9 @@ topology_template:
       scalable_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - scalable_server_pd_pattern4
+      disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.iops_server_pd_pattern4_1
       disk.allocation_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.allocation_cmaui_1c1_nested2
@@ -568,9 +562,9 @@ topology_template:
       disk.allocation_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.allocation_cmaui_1c1_nested2
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - network.incoming.packets.rate_pd_server_pattern4_port_1
+      - network.incoming.packets.rate_pd_server_pattern4_port_01
       disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.bytes.rate_cmaui_1c1_nested2
@@ -592,18 +586,12 @@ topology_template:
       os_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - os_ps_server_nested2_1b
-      cpu_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - cpu_server_pd_pattern4
       disk.device.read.requests_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.read.requests_ps_server_nested2_1b
-      disk.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.latency_server_pd_pattern4
-      disk.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.usage_server_pd_pattern4
+      network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outgoing.packets.rate_pd_server_pattern4_port_01
       disk.ephemeral.size_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.ephemeral.size_ps_server_nested2_1b
@@ -616,36 +604,30 @@ topology_template:
       feature_jsa_security_group1_test_resourceGroup:
       - test_resourceGroup
       - feature_jsa_security_group1
+      disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.write.requests.rate_server_pd_pattern4_1
       disk.device.usage_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.usage_ps_server_nested2_1b
       feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - feature_pd_server_pattern4_port_2
-      memory_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - memory_server_pd_pattern4
       disk.device.write.requests.rate_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.requests.rate_cmaui_1c1_nested2
       disk.device.write.requests.rate_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.requests.rate_cmaui_1c1_nested2
-      disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.write.bytes_server_pd_pattern4
+      - memory.usage_server_pd_pattern4_1
       disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.latency_server_pd_pattern4
       cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - cpu_util_server_pd_pattern4
-      disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.write.bytes.rate_server_pd_pattern4
-      memory.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - memory.usage_server_pd_pattern4
       binding_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - binding_cmaui_1c1_nested2
@@ -676,18 +658,21 @@ topology_template:
       disk.read.bytes.rate_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.read.bytes.rate_cmaui_1c1_nested2
+      cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - cpu_util_server_pd_pattern4_1
       disk.read.bytes.rate_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.read.bytes.rate_cmaui_1c1_nested2
       endpoint_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - endpoint_ps_server_nested2_1b
+      network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.bytes_pd_server_pattern4_port_02
       network.incoming.bytes_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port
-      vcpus_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - vcpus_server_pd_pattern4
       vcpus_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - vcpus_cmaui_1c1_nested2
@@ -697,12 +682,15 @@ topology_template:
       vcpus_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - vcpus_cmaui_1c1_nested2
-      disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.device.allocation_server_pd_pattern4
+      - disk.write.bytes.rate_server_pd_pattern4_1
       disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.iops_server_pd_pattern4
+      disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.allocation_server_pd_pattern4_1
       disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.usage_server_pd_pattern4
@@ -715,18 +703,24 @@ topology_template:
       disk.device.write.bytes_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.write.bytes_ps_server_nested2_1b
+      network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outgoing.bytes_pd_server_pattern4_port_02
       disk.latency_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.latency_ps_server_nested2_1b
       memory.resident_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - memory.resident_cmaui_1c1_nested2
-      network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - network.outpoing.packets_pd_server_pattern4_port_2
+      - network.incoming.bytes.rate_pd_server_pattern4_port_02
       disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.allocation_server_pd_pattern4
+      disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.read.bytes.rate_server_pd_pattern4_1
       feature_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - feature_pd_server_nested2_1b_pd_server_nested2_1b_port
@@ -739,24 +733,27 @@ topology_template:
       disk.read.requests_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.read.requests_pd_server_nested2_1b
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.packets.rate_pd_server_pattern4_port_2
-      memory.resident_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - memory.resident_server_pd_pattern4
-      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.device.latency_server_pd_pattern4
+      - disk.device.read.requests.rate_server_pd_pattern4_1
       disk.device.capacity_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.capacity_pd_server_nested2_1b
       disk.capacity_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.capacity_ps_server_nested2_1b
+      instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - instance_server_pd_pattern4_1
+      disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.read.requests_server_pd_pattern4_1
       os_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - os_cmaui_1c1_nested2
+      disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.latency_server_pd_pattern4_1
       disk.read.bytes_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.read.bytes_ps_server_nested2_1b
@@ -769,6 +766,15 @@ topology_template:
       attachment_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - attachment_pd_server_pattern4_port_01
+      feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - feature_pd_server_pattern4_port_02
+      feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - feature_server_pd_pattern4_1
       disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.allocation_server_pd_pattern4
@@ -778,6 +784,9 @@ topology_template:
       network.outpoing.packets_cmaui_port_2:
       - abstract_cmaui_1c1_nested2
       - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port
+      disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.iops_server_pd_pattern4_1
       disk.ephemeral.size_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.ephemeral.size_pd_server_nested2_1b
@@ -808,9 +817,18 @@ topology_template:
       memory.resident_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - memory.resident_cmaui_1c1_nested2
+      disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.write.bytes_server_pd_pattern4_1
       disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.latency_server_pd_pattern4
+      host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - host_server_pd_pattern4_1
+      disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.latency_server_pd_pattern4_1
       disk.device.iops_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.iops_cmaui_1c1_nested2
@@ -823,12 +841,6 @@ topology_template:
       disk.device.write.bytes.rate_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.write.bytes.rate_pd_server_nested2_1b
-      disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.read.bytes_server_pd_pattern4
-      disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.write.requests.rate_server_pd_pattern4
       attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - attachment_pd_server_pattern4_port_2
@@ -838,6 +850,9 @@ topology_template:
       network.incoming.packets.rate_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
+      binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - binding_pd_server_pattern4_port_01
       disk.device.read.requests_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.read.requests_cmaui_1c1_nested2
@@ -850,24 +865,21 @@ topology_template:
       disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.read.requests_server_pd_pattern4
-      network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.bytes.rate_pd_server_pattern4_port_2
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - attachment_pd_server_pattern4_port_2
+      cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - cpu.delta_server_pd_pattern4_1
       disk.usage_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.usage_pd_server_nested2_1b
       disk.device.read.bytes.rate_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.read.bytes.rate_ps_server_nested2_1b
-      cpu.delta_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - cpu.delta_server_pd_pattern4
       network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.outgoing.bytes.rate_pd_server_pattern4_port_2
+      network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.bytes_pd_server_pattern4_port_01
       disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.write.bytes_server_pd_pattern4
@@ -877,6 +889,9 @@ topology_template:
       feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - feature_pd_server_pattern4_port_1
+      network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outgoing.bytes.rate_pd_server_pattern4_port_01
       scalable_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - scalable_cmaui_1c1_nested2
@@ -889,6 +904,9 @@ topology_template:
       cpu_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - cpu_pd_server_nested2_1b
+      network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outpoing.packets_pd_server_pattern4_port_01
       disk.device.latency_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.latency_ps_server_nested2_1b
@@ -898,9 +916,15 @@ topology_template:
       memory.usage_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - memory.usage_pd_server_nested2_1b
-      disk.root.size_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.root.size_server_pd_pattern4
+      - disk.write.bytes_server_pd_pattern4_1
+      cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - cpu_server_pd_pattern4_1
+      binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - binding_server_pd_pattern4_1
       cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - cpu.delta_server_pd_pattern4
@@ -925,15 +949,24 @@ topology_template:
       disk.capacity_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.capacity_cmaui_1c1_nested2
+      disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.allocation_server_pd_pattern4_1
       disk.device.read.bytes_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.read.bytes_ps_server_nested2_1b
+      disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.usage_server_pd_pattern4_1
       disk.device.read.requests_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.read.requests_pd_server_nested2_1b
       disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.write.requests_server_pd_pattern4
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - feature_pd_server_pattern4_port_01
       endpoint_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - endpoint_cmaui_1c1_nested2
@@ -955,9 +988,6 @@ topology_template:
       feature_jsa_security_group2_test_nested3Level:
       - test_nested3Level
       - feature_jsa_security_group2
-      disk.read.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.read.requests_server_pd_pattern4
       feature_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - feature
@@ -973,9 +1003,6 @@ topology_template:
       disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.ephemeral.size_server_pd_pattern4
-      network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.bytes_pd_server_pattern4_port_2
       disk.usage_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.usage_cmaui_1c1_nested2
@@ -988,9 +1015,15 @@ topology_template:
       network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.incoming.bytes_pd_server_pattern4_port_2
+      disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.root.size_server_pd_pattern4_1
       cpu.delta_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - cpu.delta_pd_server_nested2_1b
+      disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.write.requests_server_pd_pattern4_1
       network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.incoming.bytes_pd_server_pattern4_port_1
@@ -1006,12 +1039,6 @@ topology_template:
       feature_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - feature_pd_server_nested2_1b
-      disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.write.requests_server_pd_pattern4
-      network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.bytes_pd_server_pattern4_port_1
       disk.device.read.requests.rate_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.read.requests.rate_ps_server_nested2_1b
@@ -1021,12 +1048,12 @@ topology_template:
       disk.device.read.requests.rate_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.read.requests.rate_cmaui_1c1_nested2
+      network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.packets_pd_server_pattern4_port_02
       disk.read.requests_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.read.requests_cmaui_1c1_nested2
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - binding_pd_server_pattern4_port_2
       disk.device.read.requests.rate_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.read.requests.rate_cmaui_1c1_nested2
@@ -1048,18 +1075,12 @@ topology_template:
       memory_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - memory_cmaui_1c1_nested2
-      disk.allocation_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.allocation_server_pd_pattern4
       disk.device.write.requests_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.requests_cmaui_1c1_nested2
-      disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.read.bytes_server_pd_pattern4
-      scalable_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - scalable_server_pd_pattern4
+      - memory_server_pd_pattern4_1
       disk.device.write.requests_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.requests_cmaui_1c1_nested2
@@ -1078,9 +1099,6 @@ topology_template:
       disk.device.write.bytes_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.bytes_cmaui_1c1_nested2
-      network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.bytes.rate_pd_server_pattern4_port_2
       memory_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - memory_ps_server_nested2_1b
@@ -1090,6 +1108,9 @@ topology_template:
       disk.read.bytes_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.read.bytes_cmaui_1c1_nested2
+      endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - endpoint_server_pd_pattern4_1
       disk.read.bytes_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.read.bytes_cmaui_1c1_nested2
@@ -1099,18 +1120,18 @@ topology_template:
       disk.device.write.bytes_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.write.bytes_cmaui_1c1_nested2
+      vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - vcpus_server_pd_pattern4_1
       os_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - os_server_pd_pattern4
-      disk.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.capacity_server_pd_pattern4
+      - disk.device.read.requests_server_pd_pattern4_1
       attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - attachment_pd_server_pattern4_port_1
-      network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.bytes_pd_server_pattern4_port_2
       disk.write.requests_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.write.requests_cmaui_1c1_nested2
@@ -1132,6 +1153,9 @@ topology_template:
       disk.ephemeral.size_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.ephemeral.size_cmaui_1c1_nested2
+      network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outpoing.packets_pd_server_pattern4_port_02
       disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.capacity_server_pd_pattern4
@@ -1159,9 +1183,6 @@ topology_template:
       disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.write.bytes.rate_server_pd_pattern4
-      disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.write.bytes_server_pd_pattern4
       disk.read.bytes.rate_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.read.bytes.rate_ps_server_nested2_1b
@@ -1177,36 +1198,21 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_2:
       - abstract_cmaui_1c1_nested2
       - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port
-      disk.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.iops_server_pd_pattern4
       attachment_cmaui_port_1:
       - abstract_cmaui_1c1_nested2
       - attachment_cmaui_1c1_nested2_cmaui_port
-      attachment_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - attachment_pd_server_pattern4_port_1
       disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.device.iops_server_pd_pattern4
-      feature_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - feature_pd_server_pattern4_port_1
-      disk.device.iops_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.iops_server_pd_pattern4
-      disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
+      disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
-      - disk.device.write.bytes.rate_server_pd_pattern4
+      - disk.device.read.bytes_server_pd_pattern4_1
       disk.root.size_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.root.size_cmaui_1c1_nested2
       disk.root.size_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.root.size_cmaui_1c1_nested2
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.packets_pd_server_pattern4_port_1
       disk.device.latency_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.latency_pd_server_nested2_1b
@@ -1216,6 +1222,9 @@ topology_template:
       network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - network.outgoing.bytes_pd_server_pattern4_port_1
+      disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.usage_server_pd_pattern4_1
       disk.write.bytes_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.write.bytes_cmaui_1c1_nested2
@@ -1228,12 +1237,9 @@ topology_template:
       disk.iops_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.iops_cmaui_1c1_nested2
-      os_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - os_server_pd_pattern4
-      binding_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - binding_server_pd_pattern4
+      network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outgoing.bytes_pd_server_pattern4_port_01
       disk.iops_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.iops_pd_server_nested2_1b
@@ -1246,9 +1252,6 @@ topology_template:
       disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.device.read.bytes.rate_cmaui_1c1_nested2
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outgoing.packets.rate_pd_server_pattern4_port_1
       disk.latency_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - disk.latency_cmaui_1c1_nested2
@@ -1264,21 +1267,18 @@ topology_template:
       endpoint_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - endpoint_server_pd_pattern4
+      disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.capacity_server_pd_pattern4_1
       memory_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - memory_pd_server_nested2_1b
       disk.write.requests.rate_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.write.requests.rate_ps_server_nested2_1b
-      network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.incoming.packets.rate_pd_server_pattern4_port_2
       cpu_util_server_nested2_1c1_cmaui_2:
       - abstract_cmaui_1c1_nested2
       - cpu_util_cmaui_1c1_nested2
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.write.requests.rate_server_pd_pattern4
       disk.device.read.bytes_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.read.bytes_pd_server_nested2_1b
@@ -1291,6 +1291,9 @@ topology_template:
       instance_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - instance_ps_server_nested2_1b
+      network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.incoming.bytes.rate_pd_server_pattern4_port_01
       network.incoming.bytes.rate_cmaui_port_1:
       - abstract_cmaui_1c1_nested2
       - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port
@@ -1315,39 +1318,36 @@ topology_template:
       network.incoming.bytes.rate_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
-      disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.device.read.bytes.rate_server_pd_pattern4
       disk.device.read.requests.rate_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - disk.device.read.requests.rate_pd_server_nested2_1b
       binding_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - binding_ps_server_nested2_1b
+      disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.device.write.bytes.rate_server_pd_pattern4_1
       disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
       - disk.read.bytes_server_pd_pattern4
       disk.device.allocation_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - disk.device.allocation_ps_server_nested2_1b
-      feature_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - feature_server_pd_pattern4
       scalable_server_nested2_pd_1b:
       - abstract_pd_server_nested2_1b
       - scalable_pd_server_nested2_1b
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - network.outpoing.packets_pd_server_pattern4_port_1
+      disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - disk.capacity_server_pd_pattern4_1
       network.outgoing.bytes_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port
+      network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - network.outgoing.packets.rate_pd_server_pattern4_port_02
       disk.device.allocation_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - disk.device.allocation_cmaui_1c1_nested2
-      disk.write.requests_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - disk.write.requests_server_pd_pattern4
       cpu.delta_server_nested2_ps_1b:
       - abstract_ps_server_nested2_1b
       - cpu.delta_ps_server_nested2_1b
@@ -1370,9 +1370,6 @@ topology_template:
       port_jsa_security_group1_test_resourceGroup:
       - test_resourceGroup
       - port_jsa_security_group1
-      dependency_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - dependency_pd_server_pattern4_port_2
       link_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - link_ps_server_nested2_1b_ps_server_nested2_1b_port
@@ -1388,9 +1385,9 @@ topology_template:
       dependency_server_nested2_1c1_cmaui_1:
       - abstract_cmaui_1c1_nested2
       - dependency_cmaui_1c1_nested2
-      link_pd_server_pattern4_port_2_test_nested_pattern_4_nested2:
+      dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - link_pd_server_pattern4_port_2
+      - dependency_pd_server_pattern4_port_01
       port_jsa_security_group2_test_nested3Level:
       - test_nested3Level
       - port_jsa_security_group2
@@ -1400,6 +1397,9 @@ topology_template:
       link_cmaui_port_2:
       - abstract_cmaui_1c1_nested2
       - link_cmaui_1c1_nested2_cmaui_port
+      link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - link_pd_server_pattern4_port_02
       link_cmaui_port_1:
       - abstract_cmaui_1c1_nested2
       - link_cmaui_1c1_nested2_cmaui_port
@@ -1409,6 +1409,12 @@ topology_template:
       dependency_test_resourceGroup:
       - test_resourceGroup
       - dependency
+      local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - local_storage_server_pd_pattern4_1
+      dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
+      - test_nested_pattern_4_nested2
+      - dependency_pd_server_pattern4_port_02
       dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - dependency_pd_server_pattern4_port_1
@@ -1427,18 +1433,18 @@ topology_template:
       dependency_cmaui_port_2:
       - abstract_cmaui_1c1_nested2
       - dependency_cmaui_1c1_nested2_cmaui_port
-      local_storage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - local_storage_server_pd_pattern4
       dependency_pd_server_nested2_1b_port:
       - abstract_pd_server_nested2_1b
       - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port
       port_jsa_security_group1_test_nested3Level:
       - test_nested3Level
       - port_jsa_security_group1
-      link_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
+      - test_nested_pattern_4_same_type_diff_file
+      - dependency_server_pd_pattern4_1
+      link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - link_pd_server_pattern4_port_1
+      - link_pd_server_pattern4_port_01
       dependency_ps_server_nested2_1b_port:
       - abstract_ps_server_nested2_1b
       - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port
@@ -1451,9 +1457,6 @@ topology_template:
       dependency_jsa_security_group1_test_nested3Level:
       - test_nested3Level
       - dependency_jsa_security_group1
-      dependency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file:
-      - test_nested_pattern_4_same_type_diff_file
-      - dependency_server_pd_pattern4
       link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
       - test_nested_pattern_4_same_type_diff_file
       - link_pd_server_pattern4_port_1
@@ -1471,7 +1474,4 @@ topology_template:
       - local_storage_cmaui_1c1_nested2
       dependency_test_nested_pattern_4_nested2:
       - test_nested_pattern_4_nested2
-      - dependency
-      dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
-      - test_nested_pattern_4_nested2
-      - dependency_pd_server_pattern4_port_1
\ No newline at end of file
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested1.yml
index e9a597f..b8088cc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested1.yml
@@ -31,7 +31,7 @@ parameters:
     type: string
 
 resources:
-  server_pd_1:
+  server_pd_11:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -40,10 +40,10 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd01_port_01}
       user_data_format:  RAW
 
-  server_pd_2:
+  server_pd_12:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -52,14 +52,14 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: ps02_port_0}
+        - port: {get_resource: ps02_port_01}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd01_port_01:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  ps02_port_0:
+  ps02_port_01:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested2.yml
index fd398f4..cd3d365 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested2.yml
@@ -31,7 +31,7 @@ parameters:
     type: string
 resources:
 
-  server_pd_1:
+  server_pd_21:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -40,10 +40,10 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd01_port_02}
       user_data_format:  RAW
 
-  server_pd_2:
+  server_pd_22:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -52,14 +52,14 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd02_port_0}
+        - port: {get_resource: pd02_port_02}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd01_port_02:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  pd02_port_0:
+  pd02_port_02:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested3.yml
index e2912e8..633b40b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in/nested3.yml
@@ -31,7 +31,7 @@ parameters:
     type: string
 resources:
 
-  server_pd_1:
+  server_pd_31:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -40,10 +40,10 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd01_port_0}
+        - port: {get_resource: pd01_port_03}
       user_data_format:  RAW
 
-  server_pd_2:
+  server_pd_32:
     type: OS::Nova::Server
     properties:
 #      config_drive: "True"
@@ -52,14 +52,14 @@ resources:
       flavor: {get_param: pd_flavor_name}
       availability_zone: {get_param: availabilityzone_name}
       networks:
-        - port: {get_resource: pd02_port_0}
+        - port: {get_resource: pd02_port_03}
       user_data_format:  RAW
 
-  pd01_port_0:
+  pd01_port_03:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
-  pd02_port_0:
+  pd02_port_03:
     type: OS::Neutron::Port
     properties:
       network: {get_param: oam_net_name}
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index eba51d8..fdc55c8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -16,12 +16,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_ps02_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -34,51 +28,57 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_ps02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_ps02_port_network_role_tag:
-        type: string
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_ps02_port_network_role:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_ps02_port_vlan_requirements:
+      port_pd01_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_ps02_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port_network:
+        type: list
         required: true
         status: SUPPORTED
-      vm_image_name:
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd01_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_ps02_port_subnetpoolid:
+      port_pd01_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_ps02_port_order:
-        type: integer
+      port_pd01_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
+      port_pd01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_ps02_port_network:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
@@ -99,14 +99,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_ps02_port:
+    - dependency_pd_server_pd01_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_ps02_port:
+    - link_pd_server_pd01_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -124,13 +124,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_ps02_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       memory.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -149,7 +142,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_ps02_port:
+      network.outgoing.packets.rate_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -166,6 +159,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -196,13 +195,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_pd_server:
+      network.outgoing.bytes_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_ps02_port:
+      disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -220,6 +219,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -243,13 +248,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_pd_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pd01_port:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_ps02_port:
+      disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -278,11 +282,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_ps02_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_pd_server:
         type: tosca.capabilities.Node
         occurrences:
@@ -294,18 +293,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_pd01_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       disk.write.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_ps02_port:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_ps02_port:
+      network.incoming.packets_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -335,12 +342,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_ps02_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.requests_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -360,7 +361,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_ps02_port:
+      network.outpoing.packets_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -378,15 +379,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_ps02_port:
+      disk.write.requests_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_pd_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd_server_pd01_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -408,7 +408,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_ps02_port:
+      network.outgoing.bytes.rate_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -431,6 +431,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_ps02_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -443,57 +449,51 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_ps02_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      vm_image_name:
+      port_ps02_port_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
-        type: list
+      port_ps02_port_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+      port_ps02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_ps02_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
+      port_ps02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+      port_ps02_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      compute_pd_server_user_data_format:
+          type: string
+      port_ps02_port_network:
         type: list
         required: true
         status: SUPPORTED
@@ -514,14 +514,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_ps02_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_ps02_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -539,6 +539,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_ps02_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       memory.usage_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -557,7 +564,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
+      network.incoming.bytes.rate_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -574,12 +581,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -610,13 +611,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
+      disk.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_pd_server:
+      network.incoming.packets.rate_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -634,12 +635,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       vcpus_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -663,12 +658,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
+      disk.capacity_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_pd_server:
+      network.incoming.bytes_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -697,6 +693,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pd_server_ps02_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_pd_server:
         type: tosca.capabilities.Node
         occurrences:
@@ -708,26 +709,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.write.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd_server_ps02_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      network.outgoing.bytes.rate_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -757,6 +750,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_ps02_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -776,7 +775,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
+      network.outpoing.packets_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -794,14 +793,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_pd_server:
+      network.outgoing.bytes_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.write.requests_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -823,7 +823,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      network.incoming.packets_pd_server_ps02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1273,56 +1273,56 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
-        type: string
+          type: string
+      port_pd01_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role:
+      port_pd01_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd01_port_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_ip_requirements:
-        type: list
+      port_pd01_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd02_port_network:
+      port_pd01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -1344,14 +1344,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd02_port:
+    - dependency_pd_server_pd01_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd02_port:
+    - link_pd_server_pd01_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -1387,6 +1387,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_pd_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -1398,6 +1404,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1428,14 +1440,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd02_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd02_port:
+      network.outgoing.bytes_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1459,24 +1464,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd02_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pd_server_pd02_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd02_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd02_port:
+      network.incoming.packets.rate_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1505,25 +1493,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_pd_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pd01_port:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_pd_server:
+      disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_pd_server:
+      disk.device.allocation_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pd02_port:
+      disk.allocation_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1551,13 +1538,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd02_port:
+      binding_pd_server_pd01_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_pd_server:
+      network.incoming.bytes.rate_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1606,8 +1606,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd02_port:
-        type: tosca.capabilities.Attachment
+      network.outpoing.packets_pd_server_pd01_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -1629,13 +1630,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd_server_pd01_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd02_port:
+      disk.device.latency_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1653,13 +1653,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.outgoing.bytes.rate_pd_server_pd01_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd02_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2103,56 +2103,56 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd02_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      vm_image_name:
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
-        type: list
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_network:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd01_port_order:
-        type: integer
+          type: org.openecomp.datatypes.network.VlanRequirements
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_subnetpoolid:
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role:
-        type: string
+      port_pd02_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_network_role_tag:
-        type: string
+      port_pd02_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -2174,14 +2174,14 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_pd01_port:
+    - dependency_pd_server_pd02_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd_server_pd01_port:
+    - link_pd_server_pd02_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2217,12 +2217,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_pd_server:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -2234,12 +2228,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2270,7 +2258,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pd01_port:
+      binding_pd_server_pd02_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_pd02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2294,7 +2289,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_pd01_port:
+      network.outgoing.bytes_pd_server_pd02_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pd_server_pd02_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_pd02_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_pd_server_pd02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2323,11 +2335,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_pd01_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.capacity_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2346,6 +2353,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pd_server_pd02_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_pd_server:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2368,26 +2381,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_pd01_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.write.bytes_pd_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_pd01_port:
+      network.outpoing.packets_pd_server_pd02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pd01_port:
+      disk.write.bytes_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2436,9 +2436,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_pd01_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd_server_pd02_port:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -2460,12 +2459,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_pd01_port:
-        type: tosca.capabilities.Node
+      disk.device.latency_pd_server:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_pd_server:
+      network.incoming.packets.rate_pd_server_pd02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2483,13 +2483,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_pd01_port:
+      disk.device.iops_pd_server:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_pd_server:
+      network.incoming.bytes_pd_server_pd02_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3376,54 +3376,54 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_ps02_port_0:
+    - dependency_ps02_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_ps02_port_0:
+    - link_ps02_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pd01_port_0:
+    - dependency_server_pd_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_11:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_pd_2:
+        - 0
+        - UNBOUNDED
+    - dependency_pd01_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd01_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_pd_1:
+        - 1
+        - 1
+    - dependency_server_pd_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1:
+    - local_storage_server_pd_12:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3437,426 +3437,418 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd01_port_0_test_nested2Level:
+    - dependency_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_pd_2_test_nested2Level:
+    - dependency_server_pd_31_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2_test_nested2Level:
+    - local_storage_server_pd_31_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_1_test_nested2Level:
+    - dependency_server_pd_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1_test_nested2Level:
+    - local_storage_server_pd_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd02_port_0_test_nested2Level:
+    - dependency_pd02_port_03_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd02_port_0_test_nested2Level:
+    - link_pd02_port_03_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested3Level_test_nested2Level:
+    - dependency_pd01_port_03_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd01_port_0_test_nested3Level_test_nested2Level:
+    - link_pd01_port_03_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_pd02_port_02_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0_test_nested3Level_test_nested2Level:
+    - link_pd02_port_02_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pd_2_test_nested3Level_test_nested2Level:
+    - dependency_server_pd_22_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2_test_nested3Level_test_nested2Level:
+    - local_storage_server_pd_22_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_1_test_nested3Level_test_nested2Level:
+    - dependency_server_pd_21_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1_test_nested3Level_test_nested2Level:
+    - local_storage_server_pd_21_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd02_port_0_test_nested3Level_test_nested2Level:
+    - dependency_pd01_port_02_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd02_port_0_test_nested3Level_test_nested2Level:
+    - link_pd01_port_02_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      vcpus_server_pd_1_test_nested2Level:
+      cpu_util_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      disk.allocation_server_pd_21_test_nested2Level:
         type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_pd_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_pd_1:
+      disk.device.write.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2:
+      cpu_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2:
+      disk.device.iops_server_pd_12:
         type: org.openecomp.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_pd_1:
+      disk.device.iops_server_pd_11:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      network.outgoing.bytes_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      network.incoming.packets_pd02_port_02_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_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_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pd_2_test_nested3Level_test_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_pd_22_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd02_port_0_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_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_ps02_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pd_2_test_nested2Level:
+      disk.usage_server_pd_21_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_ps02_port_01:
+        type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_pd01_port_01:
         type: org.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_pd_1_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.bytes.rate_server_pd_11:
+        type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.usage_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.device.read.bytes.rate_server_pd_12:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.device.write.bytes_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_1:
+      network.incoming.bytes.rate_ps02_port_01:
         type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests_server_pd_11:
+        type: org.openecomp.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_pd_1_test_nested2Level:
+      disk.device.read.requests_server_pd_12:
         type: org.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_pd_2:
+      disk.device.read.requests.rate_server_pd_12:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.read.requests.rate_server_pd_11:
+        type: org.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_pd_1_test_nested3Level_test_nested2Level:
+      binding_server_pd_11:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pd_1_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_pd01_port_0_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.usage_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2:
-        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_pd_12:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd01_port_02_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd_1_test_nested2Level:
+      network.incoming.bytes_ps02_port_01:
         type: org.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_pd01_port_0_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pd01_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      feature_server_pd_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      host_server_pd_1_test_nested2Level:
+      host_server_pd_21_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_1:
+      disk.read.requests_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      attachment_pd01_port_01:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      network.outgoing.packets.rate_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      scalable_server_pd_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pd_1_test_nested3Level_test_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_pd_21_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_1_test_nested2Level:
+      disk.read.bytes_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
+      network.incoming.packets_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.write.requests_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_pd_21_test_nested2Level:
         type: org.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_pd01_port_0_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_ps02_port_0:
-        type: tosca.capabilities.Attachment
+      disk.read.bytes_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_pd_1_test_nested2Level:
+      disk.usage_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      binding_pd01_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.latency_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd02_port_0_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      binding_ps02_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.usage_server_pd_1_test_nested2Level:
+      disk.read.requests_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3867,1430 +3859,1434 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd_2_test_nested3Level_test_nested2Level:
+      disk.usage_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      cpu_util_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      disk.device.iops_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.capacity_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      instance_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      vcpus_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      network.incoming.packets_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.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_pd_1_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.allocation_server_pd_2_test_nested2Level:
+      disk.device.capacity_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2:
+      memory.usage_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      network.outpoing.packets_pd01_port_02_test_nested2Level:
         type: org.openecomp.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_pd_1:
+      memory.usage_server_pd_12:
         type: org.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_pd_2:
+      disk.latency_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_1:
+      memory.usage_server_pd_11:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_pd01_port_0_test_nested2Level:
+      cpu_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_pd_22_test_nested2Level:
+        type: org.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_pd_2_test_nested2Level:
+      cpu_util_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.latency_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_1:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.bytes_server_pd_12:
+        type: org.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_pd_1:
+      disk.device.read.bytes_server_pd_11:
         type: org.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_pd_2:
+      network.incoming.bytes.rate_pd01_port_01:
         type: org.openecomp.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_pd_2_test_nested3Level_test_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_pd_12:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pd_2_test_nested3Level_test_nested2Level:
+      endpoint_server_pd_11:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd_1_test_nested2Level:
+      disk.read.bytes.rate_server_pd_11:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_pd_12:
         type: org.openecomp.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_pd01_port_0_test_nested2Level:
+      memory.resident_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      cpu.delta_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_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_pd_22_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd_1:
+      disk.device.write.requests.rate_server_pd_11:
         type: org.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_pd_1_test_nested2Level:
+      disk.latency_server_pd_11:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.write.requests.rate_server_pd_12:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      memory.usage_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.latency_server_pd_12:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      network.outgoing.bytes_ps02_port_01:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_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_pd_11:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pd_2_test_nested2Level:
+      disk.device.write.requests_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested2Level:
+      scalable_server_pd_12:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_pd_21_test_nested2Level:
         type: org.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_pd_2_test_nested2Level:
+      os_server_pd_21_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
+      disk.device.capacity_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.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_pd02_port_0_test_nested2Level:
-        type: tosca.capabilities.Node
+      endpoint_server_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_1_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_pd01_port_01:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      disk.write.requests_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_pd_22_test_nested2Level:
         type: org.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_pd_1:
+      network.outgoing.bytes.rate_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.allocation_server_pd_11:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      disk.device.read.bytes.rate_server_pd_22_test_nested2Level:
         type: org.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_pd_2:
+      disk.write.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.write.requests_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_pd_12:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      network.outgoing.packets.rate_pd01_port_01:
         type: org.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_ps02_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.write.bytes.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_1:
-        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_pd_22_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_2:
+      disk.iops_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.usage_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.device.usage_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_2:
+      disk.device.read.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.write.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.write.requests_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1:
+      disk.write.requests_server_pd_12:
         type: org.openecomp.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_pd01_port_0:
+      disk.write.requests_server_pd_11:
         type: org.openecomp.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_pd_2:
+      memory_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      network.incoming.bytes_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd01_port_03_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_2_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_ps02_port_01:
         type: org.openecomp.capabilities.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_pd_1:
+      network.outgoing.bytes_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.allocation_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_ps02_port_0:
+      disk.device.read.bytes_server_pd_21_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
+      memory.resident_server_pd_12:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      memory_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
+      memory.resident_server_pd_11:
         type: org.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_pd_2:
-        type: tosca.capabilities.network.Bindable
+      feature_pd02_port_02_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_2:
+      disk.ephemeral.size_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_1:
-        type: tosca.capabilities.network.Bindable
+      feature_pd01_port_02_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_1:
+      disk.device.read.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      network.incoming.packets_pd01_port_02_test_nested2Level:
         type: org.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_pd02_port_0_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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested2Level:
+      disk.ephemeral.size_server_pd_22_test_nested2Level:
         type: org.openecomp.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_ps02_port_0:
+      disk.device.iops_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.write.bytes_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1:
+      network.incoming.packets.rate_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_pd02_port_02_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_pd01_port_01:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.allocation_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.device.capacity_server_pd_12:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.capacity_server_pd_11:
         type: org.openecomp.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_pd_2:
+      instance_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
-        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_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd_1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.read.requests_server_pd_11:
+        type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_pd_12:
         type: org.openecomp.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_ps02_port_0:
+      disk.write.bytes_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      network.outpoing.packets_pd01_port_03_test_nested3Level_test_nested2Level:
+        type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_ps02_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_2_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      disk.write.requests.rate_server_pd_11:
         type: org.openecomp.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_pd_1_test_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_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd_2_test_nested3Level_test_nested2Level:
+      host_server_pd_32_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_2_test_nested2Level:
+      disk.device.read.requests_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      disk.write.requests.rate_server_pd_12:
         type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      disk.root.size_server_pd_22_test_nested2Level:
+        type: org.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_pd_2:
+      memory_server_pd_12:
         type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      memory_server_pd_11:
         type: org.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_pd_2:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_pd01_port_03_test_nested3Level_test_nested2Level:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Node
+      disk.allocation_server_pd_32_test_nested3Level_test_nested2Level:
+        type: org.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_pd_1_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_pd_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pd_1:
+      disk.device.latency_server_pd_12:
         type: org.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_pd_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.root.size_server_pd_32_test_nested3Level_test_nested2Level:
+        type: org.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_pd01_port_0_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      host_server_pd_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.write.bytes_server_pd_21_test_nested2Level:
+        type: org.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_pd_1_test_nested3Level_test_nested2Level:
+      vcpus_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
+      disk.device.latency_server_pd_11:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_pd_11:
         type: org.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_pd_2_test_nested2Level:
+      disk.device.usage_server_pd_12:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_pd_22_test_nested2Level:
         type: org.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_pd_2:
+      disk.read.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_1_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      disk.write.bytes_server_pd_12:
+        type: org.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_pd_1:
+      cpu_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.write.bytes_server_pd_22_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests_server_pd_22_test_nested2Level:
+        type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_pd02_port_02_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.write.bytes_server_pd_11:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_pd_21_test_nested2Level:
         type: org.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_pd_1_test_nested2Level:
+      disk.device.read.requests.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.root.size_server_pd_21_test_nested2Level:
         type: org.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_ps02_port_0:
-        type: tosca.capabilities.Node
+      disk.device.read.requests_server_pd_31_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_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_pd_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd01_port_0_test_nested2Level:
+      instance_server_pd_21_test_nested2Level:
         type: org.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_pd_1_test_nested2Level:
+      disk.write.bytes.rate_server_pd_12:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.write.bytes.rate_server_pd_11:
         type: org.openecomp.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_pd_1:
+      network.incoming.bytes.rate_pd01_port_03_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      network.incoming.packets.rate_pd01_port_02_test_nested2Level:
+        type: org.openecomp.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_pd_2:
+      network.incoming.packets_ps02_port_01:
         type: org.openecomp.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_pd_1:
+      disk.device.iops_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested2Level:
+      disk.root.size_server_pd_11:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.root.size_server_pd_12:
         type: org.openecomp.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_pd_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd02_port_02_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pd_1:
+      disk.iops_server_pd_12:
         type: org.openecomp.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_pd_2:
+      disk.iops_server_pd_11:
         type: org.openecomp.capabilities.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_pd_2:
-        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_pd_22_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pd_1:
+      cpu.delta_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      disk.root.size_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_ps02_port_01:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.iops_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_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_pd01_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pd_1:
+      disk.device.write.bytes.rate_server_pd_12:
         type: org.openecomp.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_pd_2:
+      disk.device.write.bytes.rate_server_pd_11:
         type: org.openecomp.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_pd_1:
+      disk.device.allocation_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd02_port_03_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pd_1_test_nested2Level:
+      cpu_server_pd_21_test_nested2Level:
         type: org.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_pd_1_test_nested2Level:
+      disk.device.usage_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      binding_pd02_port_03_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_pd_12:
         type: org.openecomp.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_ps02_port_0:
+      disk.read.bytes_server_pd_11:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      network.outpoing.packets_pd02_port_02_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
-        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_pd_21_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd02_port_0_test_nested2Level:
+      network.incoming.packets_pd01_port_01:
         type: org.openecomp.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_ps02_port_0:
+      network.incoming.packets.rate_pd01_port_01:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      cpu_util_server_pd_12:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.latency_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      cpu_util_server_pd_11:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      disk.device.allocation_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_server_pd_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_1_test_nested3Level_test_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_pd_12:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_pd_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      host_server_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd_2_test_nested2Level:
+      disk.device.iops_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      cpu.delta_server_pd_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.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_pd_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pd_21_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pd_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.
+      attachment_pd01_port_03_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pd_2:
+      disk.device.read.bytes_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1:
+      memory_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      binding_pd01_port_03_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.capacity_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      disk.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.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_ps02_port_0:
+      disk.device.write.requests_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.device.capacity_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      cpu.delta_server_pd_11:
         type: org.openecomp.capabilities.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_pd_1:
-        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_pd_11:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_1_test_nested3Level_test_nested2Level:
+      cpu.delta_server_pd_12:
         type: org.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_pd02_port_0_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      host_server_pd_12:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pd_2_test_nested2Level:
+      network.outgoing.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      cpu.delta_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_pd_11:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested2Level:
+      network.incoming.packets.rate_pd02_port_02_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.ephemeral.size_server_pd_12:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd01_port_0:
-        type: tosca.capabilities.Node
+      memory.usage_server_pd_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.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_pd_2:
+      instance_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      memory.resident_server_pd_22_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.capacity_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_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_pd_31_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pd_1_test_nested2Level:
+      network.incoming.bytes_pd01_port_01:
         type: org.openecomp.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_pd01_port_0_test_nested2Level:
+      network.outpoing.packets_ps02_port_01:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      disk.device.write.requests_server_pd_22_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_pd01_port_02_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_pd_12:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_pd02_port_02_test_nested2Level:
         type: org.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_pd_1_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.requests_server_pd_11:
+        type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      instance_server_pd_11:
         type: org.openecomp.capabilities.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_pd_1_test_nested2Level:
+      memory.resident_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      instance_server_pd_12:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_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_pd_11:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd_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.
+      os_server_pd_12:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pd_2_test_nested2Level:
+      disk.device.write.bytes.rate_server_pd_22_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      disk.capacity_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_pd_21_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_1_test_nested3Level_test_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_pd_22_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd_1_test_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_pd02_port_03_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps02_port_0:
+      vcpus_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0:
+      network.incoming.bytes_pd02_port_03_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      memory_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      vcpus_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.latency_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      binding_pd01_port_02_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.capacity_server_pd_11:
         type: org.openecomp.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_pd_1_test_nested2Level:
+      feature_server_pd_22_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_pd_21_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      binding_pd02_port_02_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.capacity_server_pd_22_test_nested2Level:
         type: org.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_pd_2_test_nested2Level:
+      endpoint_server_pd_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_pd_12:
         type: org.openecomp.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_pd01_port_0:
+      network.incoming.bytes_pd01_port_02_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd02_port_0_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      disk.ephemeral.size_server_pd_32_test_nested3Level_test_nested2Level:
+        type: org.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_pd_2_test_nested2Level:
+      network.incoming.bytes.rate_pd01_port_02_test_nested2Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.write.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.iops_server_pd_31_test_nested3Level_test_nested2Level:
         type: org.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_pd_2:
+      disk.write.requests_server_pd_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_pd_1_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_pd02_port_02_test_nested2Level:
         type: org.openecomp.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_pd02_port_0_test_nested2Level:
+      cpu_util_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5301,107 +5297,111 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd02_port_0_test_nested2Level:
+      disk.allocation_server_pd_22_test_nested2Level:
         type: org.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_pd_1:
+      network.outgoing.packets.rate_pd01_port_02_test_nested2Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.OperatingSystem
+      disk.read.bytes_server_pd_21_test_nested2Level:
+        type: org.openecomp.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_pd_1:
+      disk.usage_server_pd_12:
         type: org.openecomp.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_pd_2:
+      vcpus_server_pd_12:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.usage_server_pd_11:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level_test_nested2Level:
+      vcpus_server_pd_11:
         type: org.openecomp.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_pd02_port_0_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_pd_11:
         type: org.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_pd_2:
-        type: tosca.capabilities.Scalable
+      disk.allocation_server_pd_11:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Scalable
+      network.outgoing.packets.rate_pd02_port_02_test_nested2Level:
+        type: org.openecomp.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_pd_2_test_nested3Level_test_nested2Level:
+      disk.allocation_server_pd_12:
         type: org.openecomp.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_ps02_port_0:
+      disk.device.write.bytes_server_pd_12:
         type: org.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_pd_1_test_nested2Level:
+      network.outgoing.bytes_pd01_port_02_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.device.latency_server_pd_21_test_nested2Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested2Level:
+      disk.read.requests_server_pd_22_test_nested2Level:
         type: org.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_pd_2_test_nested3Level_test_nested2Level:
+      cpu_server_pd_12:
         type: org.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_pd_2_test_nested2Level:
+      cpu_server_pd_11:
         type: org.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_pd_1:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.bytes_server_pd_31_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -5456,1352 +5456,1352 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_pd01_port_0:
+    - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_pd_2:
+    - dependency_server_pd_31_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2:
+    - local_storage_server_pd_31_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_1:
+    - dependency_server_pd_32_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1:
+    - local_storage_server_pd_32_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd02_port_0:
+    - dependency_pd02_port_03_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd02_port_0:
+    - link_pd02_port_03_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested3Level:
+    - dependency_pd01_port_03_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd01_port_0_test_nested3Level:
+    - link_pd01_port_03_test_nested3Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_pd02_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0_test_nested3Level:
+    - link_pd02_port_02:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pd_2_test_nested3Level:
+    - dependency_server_pd_22:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2_test_nested3Level:
+    - local_storage_server_pd_22:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_1_test_nested3Level:
+    - dependency_server_pd_21:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1_test_nested3Level:
+    - local_storage_server_pd_21:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd02_port_0_test_nested3Level:
+    - dependency_pd01_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd02_port_0_test_nested3Level:
+    - link_pd01_port_02:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.read.bytes.rate_server_pd_2_test_nested3Level:
+      disk.write.bytes.rate_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_2_test_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_pd_31_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd_1:
+      network.outgoing.bytes_pd02_port_03_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      scalable_server_pd_32_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_pd_21:
         type: org.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_pd01_port_0_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.read.requests_server_pd_22:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd_2:
+      disk.write.requests.rate_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      disk.allocation_server_pd_21:
         type: org.openecomp.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_pd_1:
+      disk.allocation_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      disk.device.read.requests.rate_server_pd_21:
         type: org.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_pd_2_test_nested3Level:
+      scalable_server_pd_31_test_nested3Level:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd02_port_0_test_nested3Level:
+      disk.device.allocation_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd02_port_0:
+      disk.device.read.requests.rate_server_pd_22:
         type: org.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_pd_1_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      binding_server_pd_22:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pd_1_test_nested3Level:
+      memory.usage_server_pd_22:
         type: org.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_pd_1:
-        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_pd_21:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_2:
+      memory.usage_server_pd_21:
         type: org.openecomp.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_pd02_port_0:
+      network.outgoing.bytes_pd01_port_02:
         type: org.openecomp.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_pd_2:
+      disk.device.read.bytes.rate_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd02_port_03_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd01_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.read.requests_server_pd_32_test_nested3Level:
+        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
-      network.outgoing.bytes.rate_pd02_port_0_test_nested3Level:
+      network.incoming.packets.rate_pd02_port_02:
         type: org.openecomp.capabilities.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_pd_1:
+      network.outpoing.packets_pd02_port_03_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.read.bytes.rate_server_pd_31_test_nested3Level:
         type: org.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_pd02_port_0_test_nested3Level:
+      feature_pd02_port_02:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pd_1_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      disk.read.bytes.rate_server_pd_32_test_nested3Level:
+        type: org.openecomp.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_pd01_port_0:
+      disk.write.requests.rate_server_pd_31_test_nested3Level:
         type: org.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_pd_2_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd01_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd_1_test_nested3Level:
+      binding_pd01_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.allocation_server_pd_32_test_nested3Level:
         type: org.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_pd_1_test_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_pd_31_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_1_test_nested3Level:
+      disk.usage_server_pd_31_test_nested3Level:
         type: org.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_pd_2_test_nested3Level:
+      disk.ephemeral.size_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.device.iops_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      network.outpoing.packets_pd02_port_02:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      network.incoming.bytes_pd01_port_03_test_nested3Level:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      network.incoming.bytes.rate_pd02_port_02:
         type: org.openecomp.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_pd_2:
+      host_server_pd_31_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_1:
+      disk.device.iops_server_pd_22:
         type: org.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_pd_2:
+      disk.device.iops_server_pd_21:
         type: org.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_pd_1:
+      disk.ephemeral.size_server_pd_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes.rate_server_pd_32_test_nested3Level:
+        type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      disk.ephemeral.size_server_pd_22:
         type: org.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_pd_2:
+      endpoint_server_pd_32_test_nested3Level:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pd_1:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu_server_pd_31_test_nested3Level:
+        type: org.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_pd_1:
+      memory_server_pd_32_test_nested3Level:
         type: org.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_pd_2:
+      network.incoming.bytes.rate_pd01_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_pd02_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.write.requests_server_pd_2_test_nested3Level:
+      memory.resident_server_pd_21:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      disk.device.usage_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1:
+      memory.resident_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.usage_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1_test_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_pd_22:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pd_2_test_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_pd_21:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd01_port_0:
+      disk.device.read.bytes_server_pd_22:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      disk.device.read.bytes_server_pd_21:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      network.incoming.packets_pd01_port_03_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1_test_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_pd_32_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd_1_test_nested3Level:
+      disk.device.write.bytes_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level:
+      disk.device.read.bytes_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      network.incoming.packets_pd02_port_02:
         type: org.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_pd_1:
+      disk.device.read.bytes_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd01_port_03_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_1_test_nested3Level:
+      disk.device.write.requests.rate_server_pd_22:
         type: org.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_pd_2:
+      network.outgoing.bytes.rate_pd01_port_02:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.write.requests.rate_server_pd_21:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.device.write.requests.rate_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd02_port_0:
+      feature_server_pd_31_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_pd02_port_03_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_1:
+      memory.usage_server_pd_32_test_nested3Level:
         type: org.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_pd_2_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.allocation_server_pd_21:
+        type: org.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_pd_2:
+      disk.device.allocation_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.write.requests_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      disk.read.requests_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      disk.write.bytes.rate_server_pd_22:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.write.bytes.rate_server_pd_21:
         type: org.openecomp.capabilities.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_pd_2:
-        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_pd_32_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd_1:
+      network.outgoing.packets.rate_pd01_port_02:
         type: org.openecomp.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_pd01_port_0:
+      network.incoming.bytes_pd02_port_02:
         type: org.openecomp.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_pd_2:
+      endpoint_server_pd_22:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1:
+      endpoint_server_pd_21:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests.rate_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.latency_server_pd_21:
         type: org.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_pd_2_test_nested3Level:
+      disk.latency_server_pd_22:
         type: org.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_pd02_port_0_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_pd01_port_03_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.outpoing.packets_pd01_port_0:
+      instance_server_pd_32_test_nested3Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_pd_2:
+      disk.allocation_server_pd_31_test_nested3Level:
         type: org.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_pd_1:
-        type: tosca.capabilities.network.Bindable
+      memory.resident_server_pd_31_test_nested3Level:
+        type: org.openecomp.capabilities.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_pd_1:
+      disk.device.capacity_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      disk.write.requests_server_pd_21:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      cpu.delta_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_2:
-        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_pd_32_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd02_port_0_test_nested3Level:
+      disk.write.requests_server_pd_22:
         type: org.openecomp.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_pd_1:
+      disk.read.bytes_server_pd_21:
         type: org.openecomp.capabilities.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_pd_1:
+      memory_server_pd_22:
         type: org.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_pd_1_test_nested3Level:
+      disk.read.bytes_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2:
+      memory_server_pd_21:
         type: org.openecomp.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_pd_2:
+      network.outgoing.packets.rate_pd02_port_02:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.write.requests_server_pd_31_test_nested3Level:
         type: org.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_pd_1_test_nested3Level:
-        type: tosca.capabilities.Node
+      attachment_pd02_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd_2_test_nested3Level:
+      network.outpoing.packets_pd01_port_02:
         type: org.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_pd_1_test_nested3Level:
+      network.incoming.packets_pd02_port_03_test_nested3Level:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      disk.iops_server_pd_32_test_nested3Level:
         type: org.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_pd_1_test_nested3Level:
+      disk.write.bytes_server_pd_22:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      disk.write.bytes_server_pd_21:
         type: org.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_pd01_port_0_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_pd_1_test_nested3Level:
+      disk.root.size_server_pd_21:
         type: org.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_pd_2_test_nested3Level:
+      disk.root.size_server_pd_22:
         type: org.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_pd_1_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.capacity_server_pd_31_test_nested3Level:
+        type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      network.outgoing.packets.rate_pd01_port_03_test_nested3Level:
         type: org.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_pd_2:
+      network.incoming.bytes_pd02_port_03_test_nested3Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_pd_31_test_nested3Level:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Node
+      disk.device.write.requests.rate_server_pd_31_test_nested3Level:
+        type: org.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_pd_1:
+      disk.device.capacity_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      disk.device.capacity_server_pd_21:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      disk.read.requests_server_pd_21:
         type: org.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_pd_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.read.requests_server_pd_22:
+        type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      disk.write.requests.rate_server_pd_21:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      disk.device.latency_server_pd_32_test_nested3Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.read.bytes_server_pd_31_test_nested3Level:
+        type: org.openecomp.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_pd01_port_0:
+      disk.write.requests.rate_server_pd_22:
         type: org.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_pd_2_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.latency_server_pd_31_test_nested3Level:
+        type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.device.latency_server_pd_21:
         type: org.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_pd_2:
+      disk.device.write.requests_server_pd_21:
         type: org.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_pd_1:
+      disk.device.latency_server_pd_22:
         type: org.openecomp.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_pd02_port_0:
+      disk.device.usage_server_pd_22:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      cpu.delta_server_pd_32_test_nested3Level:
         type: org.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_pd_1_test_nested3Level:
+      disk.device.usage_server_pd_21:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      cpu_util_server_pd_21:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      cpu_util_server_pd_22:
         type: org.openecomp.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_pd_1:
+      disk.device.write.requests_server_pd_22:
         type: org.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_pd_2_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_pd01_port_02:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd_2:
+      memory.usage_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_1:
+      disk.read.bytes_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      network.outgoing.bytes_pd02_port_02:
         type: org.openecomp.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_pd_1:
+      disk.device.read.requests.rate_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd02_port_0:
+      vcpus_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      disk.read.bytes.rate_server_pd_21:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.capacity_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.read.bytes.rate_server_pd_22:
         type: org.openecomp.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_pd02_port_0:
+      disk.latency_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level:
+      network.incoming.packets.rate_pd01_port_02:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      network.incoming.packets_pd01_port_02:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      disk.iops_server_pd_22:
         type: org.openecomp.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_pd_1:
+      cpu.delta_server_pd_21:
         type: org.openecomp.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_pd_2:
+      cpu.delta_server_pd_22:
         type: org.openecomp.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_pd_1:
+      disk.iops_server_pd_21:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      memory.resident_server_pd_32_test_nested3Level:
         type: org.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_pd_1_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.write.requests_server_pd_32_test_nested3Level:
+        type: org.openecomp.capabilities.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_pd_1:
+      disk.device.write.bytes.rate_server_pd_22:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.write.bytes.rate_server_pd_21:
         type: org.openecomp.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_pd02_port_0_test_nested3Level:
+      disk.device.read.requests_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.iops_server_pd_31_test_nested3Level:
         type: org.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_pd02_port_0:
-        type: tosca.capabilities.Node
+      scalable_server_pd_22:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd01_port_0_test_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_pd_21:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pd_2:
+      disk.write.requests_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      instance_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      disk.write.bytes_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_1:
+      disk.root.size_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1_test_nested3Level:
+      vcpus_server_pd_32_test_nested3Level:
         type: org.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_pd_2_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_pd_1_test_nested3Level:
+      disk.latency_server_pd_32_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      network.incoming.packets.rate_pd02_port_03_test_nested3Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      disk.root.size_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      memory_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_2:
-        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_pd_22:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd_1:
+      disk.ephemeral.size_server_pd_31_test_nested3Level:
         type: org.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_pd_2_test_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_pd_21:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pd_2_test_nested3Level:
+      cpu_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      network.incoming.bytes_pd01_port_02:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      cpu_util_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_pd_22:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd01_port_0:
-        type: tosca.capabilities.Node
+      host_server_pd_21:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_2:
+      cpu_util_server_pd_31_test_nested3Level:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.capacity_server_pd_22:
         type: org.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_pd_2_test_nested3Level:
+      disk.capacity_server_pd_21:
         type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      network.outgoing.packets.rate_pd02_port_03_test_nested3Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level:
+      network.outpoing.packets_pd01_port_03_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      network.outgoing.bytes_pd01_port_03_test_nested3Level:
         type: org.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_pd_1_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_server_pd_32_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd01_port_0:
+      disk.device.read.requests_server_pd_31_test_nested3Level:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      disk.capacity_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd02_port_0_test_nested3Level:
+      disk.device.iops_server_pd_31_test_nested3Level:
         type: org.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_pd02_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.read.bytes_server_pd_2_test_nested3Level:
+      disk.device.read.bytes.rate_server_pd_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_server_pd_1_test_nested3Level:
+      disk.device.write.bytes.rate_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.device.read.bytes.rate_server_pd_21:
         type: org.openecomp.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_pd01_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_2_test_nested3Level:
+      disk.usage_server_pd_22:
         type: org.openecomp.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_pd02_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pd01_port_03_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outpoing.packets_pd02_port_0:
+      disk.usage_server_pd_21:
         type: org.openecomp.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_pd_2_test_nested3Level:
+      vcpus_server_pd_21:
         type: org.openecomp.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_pd01_port_0:
+      vcpus_server_pd_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd02_port_0_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      disk.usage_server_pd_32_test_nested3Level:
+        type: org.openecomp.capabilities.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_pd_2_test_nested3Level:
+      instance_server_pd_22:
         type: org.openecomp.capabilities.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_pd_1:
+      instance_server_pd_21:
         type: org.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_pd_2_test_nested3Level:
+      binding_pd02_port_03_test_nested3Level:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.read.requests_server_pd_2_test_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_pd_31_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pd_2:
+      disk.device.write.bytes_server_pd_22:
         type: org.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_pd_2:
+      disk.device.write.bytes_server_pd_21:
         type: org.openecomp.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_pd01_port_0_test_nested3Level:
+      cpu_server_pd_21:
         type: org.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_pd_1:
+      network.incoming.bytes.rate_pd01_port_03_test_nested3Level:
         type: org.openecomp.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_pd02_port_0:
+      cpu_server_pd_22:
         type: org.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_pd_2:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_pd_1_test_nested3Level:
+      disk.device.write.bytes_server_pd_32_test_nested3Level:
         type: org.openecomp.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_pd_1:
+      network.outgoing.bytes.rate_pd01_port_03_test_nested3Level:
         type: org.openecomp.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_pd_2:
+      network.incoming.bytes.rate_pd02_port_03_test_nested3Level:
         type: org.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_pd_2:
-        type: tosca.capabilities.Scalable
+      network.outgoing.bytes.rate_pd02_port_03_test_nested3Level:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Scalable
+      network.outgoing.bytes.rate_pd02_port_02:
+        type: org.openecomp.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_pd_1_test_nested3Level:
+      disk.device.allocation_server_pd_31_test_nested3Level:
         type: org.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_pd_1:
-        type: tosca.capabilities.OperatingSystem
+      network.incoming.packets.rate_pd01_port_03_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -6856,672 +6856,672 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_pd01_port_0:
+    - dependency_server_pd_31:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd01_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pd_31:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_pd_2:
+        - 0
+        - UNBOUNDED
+    - dependency_server_pd_32:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_2:
+    - local_storage_server_pd_32:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_pd_1:
+    - dependency_pd02_port_03:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd_1:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pd02_port_03:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pd02_port_0:
+        - 1
+        - 1
+    - dependency_pd01_port_03:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pd02_port_0:
+    - link_pd01_port_03:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.iops_server_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd02_port_03:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd_2:
+      disk.root.size_server_pd_31:
         type: org.openecomp.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_pd_2:
+      disk.root.size_server_pd_32:
         type: org.openecomp.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_pd_1:
+      network.outgoing.packets.rate_pd02_port_03:
         type: org.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_pd_2:
+      disk.iops_server_pd_32:
         type: org.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_pd_2:
-        type: tosca.capabilities.Node
+      disk.iops_server_pd_31:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_pd01_port_03:
+        type: org.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_pd_1:
+      disk.device.write.bytes.rate_server_pd_32:
         type: org.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_pd_1:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.write.bytes.rate_server_pd_31:
+        type: org.openecomp.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_pd02_port_0:
+      network.outgoing.bytes_pd01_port_03:
         type: org.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_pd_2:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.write.requests_server_pd_32:
+        type: org.openecomp.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_pd01_port_0:
+      disk.write.requests_server_pd_31:
         type: org.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_pd_2:
+      disk.read.bytes_server_pd_32:
         type: org.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_pd_1:
+      disk.read.bytes_server_pd_31:
         type: org.openecomp.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_pd02_port_0:
+      network.incoming.packets.rate_pd02_port_03:
         type: org.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_pd_1:
+      cpu_util_server_pd_31:
         type: org.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_pd_2:
+      cpu_util_server_pd_32:
         type: org.openecomp.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_pd02_port_0:
+      disk.allocation_server_pd_31:
         type: org.openecomp.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_pd_1:
+      disk.allocation_server_pd_32:
         type: org.openecomp.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_pd_2:
+      disk.device.write.bytes_server_pd_32:
         type: org.openecomp.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_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd02_port_03:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd_2:
+      disk.device.write.bytes_server_pd_31:
         type: org.openecomp.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_pd_1:
+      memory.usage_server_pd_32:
         type: org.openecomp.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_pd_2:
+      memory.usage_server_pd_31:
         type: org.openecomp.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_pd_1:
+      disk.read.bytes.rate_server_pd_31:
         type: org.openecomp.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_pd02_port_0:
+      disk.read.bytes.rate_server_pd_32:
         type: org.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_pd01_port_0:
+      binding_pd01_port_03:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      disk.read.requests_server_pd_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pd01_port_03:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pd_2:
+      disk.device.read.bytes_server_pd_32:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.read.bytes_server_pd_31:
         type: org.openecomp.capabilities.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_pd_1:
+      cpu.delta_server_pd_31:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.iops_server_pd_32:
         type: org.openecomp.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_pd02_port_0:
+      disk.device.iops_server_pd_31:
         type: org.openecomp.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_pd01_port_0:
+      cpu.delta_server_pd_32:
         type: org.openecomp.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_pd_1:
+      disk.ephemeral.size_server_pd_32:
         type: org.openecomp.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_pd_2:
+      disk.read.requests_server_pd_32:
         type: org.openecomp.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_pd_1:
-        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_pd_31:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pd_1:
+      disk.ephemeral.size_server_pd_31:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.read.requests_server_pd_31:
         type: org.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_pd02_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_pd_2:
+      network.outgoing.bytes_pd02_port_03:
         type: org.openecomp.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_pd_2:
+      network.outpoing.packets_pd02_port_03:
         type: org.openecomp.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_pd_1:
+      disk.device.write.requests.rate_server_pd_31:
         type: org.openecomp.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_pd_2:
+      disk.device.write.requests.rate_server_pd_32:
         type: org.openecomp.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_pd_1:
+      network.incoming.bytes.rate_pd02_port_03:
         type: org.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_pd_2:
-        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_pd_32:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pd_1:
+      disk.device.latency_server_pd_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd01_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.write.requests_server_pd_32:
+        type: org.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_pd_2:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.packets.rate_pd01_port_03:
+        type: org.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_pd_1:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.write.requests_server_pd_31:
+        type: org.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_pd_1:
+      disk.device.latency_server_pd_31:
         type: org.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_pd_2:
+      network.incoming.packets_pd01_port_03:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.usage_server_pd_31:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.usage_server_pd_32:
         type: org.openecomp.capabilities.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_pd_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pd01_port_03:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd_2:
+      disk.device.read.requests_server_pd_32:
         type: org.openecomp.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_pd01_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_pd_31:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd01_port_0:
-        type: tosca.capabilities.Node
+      os_server_pd_32:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_2:
+      disk.device.read.requests_server_pd_31:
         type: org.openecomp.capabilities.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_pd_1:
+      network.incoming.bytes.rate_pd01_port_03:
         type: org.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_pd_1:
+      binding_pd02_port_03:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.capacity_server_pd_32:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.capacity_server_pd_31:
         type: org.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_pd_2:
+      network.incoming.bytes_pd01_port_03:
         type: org.openecomp.capabilities.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_pd_2:
+      vcpus_server_pd_31:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd02_port_0:
-        type: tosca.capabilities.Attachment
+      network.incoming.packets_pd02_port_03:
+        type: org.openecomp.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_pd01_port_0:
+      disk.usage_server_pd_32:
         type: org.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_pd_1:
+      vcpus_server_pd_32:
         type: org.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_pd_2:
+      memory.resident_server_pd_32:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.usage_server_pd_31:
         type: org.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_pd02_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.allocation_server_pd_2:
+      memory.resident_server_pd_31:
         type: org.openecomp.capabilities.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_pd_1:
+      network.outgoing.bytes.rate_pd01_port_03:
         type: org.openecomp.capabilities.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_pd_2:
+      cpu_server_pd_32:
         type: org.openecomp.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_pd_1:
+      cpu_server_pd_31:
         type: org.openecomp.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_pd01_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pd_31:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pd_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pd_32:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pd_1:
-        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_pd_32:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd_1:
-        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_pd_31:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd01_port_0:
+      disk.device.capacity_server_pd_31:
         type: org.openecomp.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_pd02_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_pd_31:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_pd_32:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd02_port_0:
+      disk.device.capacity_server_pd_32:
         type: org.openecomp.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_pd01_port_0:
+      disk.latency_server_pd_32:
         type: org.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_pd_2:
-        type: tosca.capabilities.network.Bindable
+      disk.write.requests.rate_server_pd_31:
+        type: org.openecomp.capabilities.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_pd_2:
+      disk.write.requests.rate_server_pd_32:
         type: org.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_pd_1:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.packets.rate_pd01_port_03:
+        type: org.openecomp.capabilities.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_pd_1:
+      memory_server_pd_32:
         type: org.openecomp.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_pd01_port_0:
+      network.incoming.bytes_pd02_port_03:
         type: org.openecomp.capabilities.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_pd_1:
+      memory_server_pd_31:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.read.bytes.rate_server_pd_31:
         type: org.openecomp.capabilities.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_pd_2:
+      disk.device.read.bytes.rate_server_pd_32:
         type: org.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_pd_2:
+      disk.latency_server_pd_31:
         type: org.openecomp.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_pd_1:
+      disk.device.allocation_server_pd_32:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.device.read.requests.rate_server_pd_31:
         type: org.openecomp.capabilities.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_pd_2:
+      instance_server_pd_32:
         type: org.openecomp.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_pd_2:
+      disk.device.allocation_server_pd_31:
         type: org.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_pd_1:
+      disk.write.bytes_server_pd_31:
         type: org.openecomp.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_pd02_port_0:
+      binding_server_pd_31:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests.rate_server_pd_32:
         type: org.openecomp.capabilities.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_pd_1:
+      disk.write.bytes_server_pd_32:
         type: org.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_pd_2:
-        type: tosca.capabilities.OperatingSystem
+      binding_server_pd_32:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pd_1:
+      network.outgoing.bytes.rate_pd02_port_03:
         type: org.openecomp.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_pd_2:
+      disk.write.bytes.rate_server_pd_32:
         type: org.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_pd_2:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_pd_1:
-        type: tosca.capabilities.Scalable
+      instance_server_pd_31:
+        type: org.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_pd_1:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.bytes.rate_server_pd_31:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
index bf1cc92..575c086 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -28,45 +28,45 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
+    port_pd01_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_subnetpoolid:
+    vm_image_name:
       type: string
       required: true
-    port_pd02_port_network_role_tag:
-      type: string
+    port_pd01_port_ip_requirements:
+      type: list
       required: true
-    port_pd02_port_vlan_requirements:
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    vm_image_name:
-      type: string
+        type: string
+    port_pd01_port_order:
+      type: integer
       required: true
-    port_pd02_port_network_role:
+    port_pd01_port_subnetpoolid:
       type: string
       required: true
-    port_pd02_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd01_port_network_role:
+      type: string
       required: true
-    port_pd02_port_ip_requirements:
-      type: list
+    port_pd01_port_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd02_port_network:
+    port_pd01_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: org.openecomp.datatypes.network.VlanRequirements
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -92,28 +92,28 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd02_port:
+    pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd02_port_exCP_naming
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
-          get_input: port_pd02_port_vlan_requirements
+          get_input: port_pd01_port_vlan_requirements
         ip_requirements:
-          get_input: port_pd02_port_ip_requirements
+          get_input: port_pd01_port_ip_requirements
         network_role_tag:
-          get_input: port_pd02_port_network_role_tag
+          get_input: port_pd01_port_network_role_tag
         mac_requirements:
-          get_input: port_pd02_port_mac_requirements
+          get_input: port_pd01_port_mac_requirements
         order:
-          get_input: port_pd02_port_order
+          get_input: port_pd01_port_order
         network_role:
-          get_input: port_pd02_port_network_role
+          get_input: port_pd01_port_network_role
         subnetpoolid:
-          get_input: port_pd02_port_subnetpoolid
+          get_input: port_pd01_port_subnetpoolid
         network:
           get_input:
-          - port_pd02_port_network
+          - port_pd01_port_network
           - index_value
       requirements:
       - binding:
@@ -138,12 +138,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
+      network.outgoing.packets.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.packets.rate
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
+      network.incoming.bytes_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.bytes
       cpu_pd_server:
       - pd_server
       - cpu
@@ -159,12 +165,9 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      binding_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - binding
-      network.outgoing.packets.rate_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.outgoing.packets.rate
+      network.outgoing.bytes_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -174,18 +177,9 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.outgoing.bytes_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.outgoing.bytes
-      feature_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - feature
-      network.incoming.bytes.rate_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.incoming.bytes.rate
-      network.outgoing.bytes.rate_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
@@ -198,6 +192,9 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
+      attachment_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -207,9 +204,6 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
-      network.incoming.packets_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.incoming.packets
       binding_pd_server:
       - pd_server
       - binding
@@ -222,12 +216,18 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      network.outpoing.packets_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.outpoing.packets
+      binding_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
+      network.incoming.bytes.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.bytes.rate
+      network.incoming.packets_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -249,9 +249,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      attachment_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - attachment
+      network.outpoing.packets_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outpoing.packets
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -261,34 +261,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      feature_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
-      network.incoming.packets.rate_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
+      network.outgoing.bytes.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
-      network.incoming.bytes_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - network.incoming.bytes
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd02_port:
-      - pd_server_pd02_port
+      link_pd_server_pd01_port:
+      - pd_server_pd01_port
       - link
+      dependency_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
-      dependency_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
index a215d7a..9ac7e11 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -28,45 +28,45 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd02_port_order:
+      type: integer
       required: true
-    vm_image_name:
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
-      type: list
+    port_pd02_port_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
-      required: true
-    port_pd01_port_subnetpoolid:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role:
+    port_pd02_port_network_role:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_pd02_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_vlan_requirements:
+    port_pd02_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd02_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -92,28 +92,28 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_pd02_port_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_pd02_port_vlan_requirements
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_pd02_port_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_pd02_port_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_pd02_port_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_pd02_port_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_pd02_port_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_pd02_port_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_pd02_port_network
           - index_value
       requirements:
       - binding:
@@ -138,18 +138,12 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
       cpu_pd_server:
       - pd_server
       - cpu
@@ -165,9 +159,12 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
+      binding_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - binding
+      network.outgoing.packets.rate_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.outgoing.packets.rate
       disk.iops_pd_server:
       - pd_server
       - disk.iops
@@ -177,9 +174,18 @@ topology_template:
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
+      network.outgoing.bytes_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.outgoing.bytes
+      feature_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - feature
+      network.incoming.bytes.rate_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.outgoing.bytes.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
@@ -192,9 +198,6 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
@@ -204,6 +207,9 @@ topology_template:
       disk.allocation_pd_server:
       - pd_server
       - disk.allocation
+      network.incoming.packets_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.incoming.packets
       binding_pd_server:
       - pd_server
       - binding
@@ -216,18 +222,12 @@ topology_template:
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - binding
+      network.outpoing.packets_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.outpoing.packets
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -249,9 +249,9 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outpoing.packets
+      attachment_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - attachment
       disk.write.requests.rate_pd_server:
       - pd_server
       - disk.write.requests.rate
@@ -261,34 +261,34 @@ topology_template:
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
+      network.incoming.packets.rate_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.incoming.packets.rate
       disk.latency_pd_server:
       - pd_server
       - disk.latency
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
+      network.incoming.bytes_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - network.incoming.bytes
     requirements:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_pd02_port:
+      - pd_server_pd02_port
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
       - dependency
+      dependency_pd_server_pd02_port:
+      - pd_server_pd02_port
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
index 75c7de4..e74e2b0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
@@ -18,11 +18,6 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_ps02_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -33,41 +28,46 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_ps02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_ps02_port_network_role_tag:
-      type: string
+    port_pd01_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_ps02_port_network_role:
+    vm_image_name:
       type: string
       required: true
-    port_ps02_port_vlan_requirements:
+    port_pd01_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_ps02_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port_network:
+      type: list
       required: true
-    vm_image_name:
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: integer
+      required: true
+    port_pd01_port_subnetpoolid:
       type: string
       required: true
-    port_ps02_port_subnetpoolid:
+    port_pd01_port_network_role:
       type: string
       required: true
-    port_ps02_port_order:
-      type: integer
+    port_pd01_port_network_role_tag:
+      type: string
       required: true
-    compute_pd_server_user_data_format:
+    port_pd01_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_ps02_port_network:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
@@ -92,28 +92,28 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_ps02_port:
+    pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_ps02_port_exCP_naming
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
-          get_input: port_ps02_port_vlan_requirements
+          get_input: port_pd01_port_vlan_requirements
         ip_requirements:
-          get_input: port_ps02_port_ip_requirements
+          get_input: port_pd01_port_ip_requirements
         network_role_tag:
-          get_input: port_ps02_port_network_role_tag
+          get_input: port_pd01_port_network_role_tag
         mac_requirements:
-          get_input: port_ps02_port_mac_requirements
+          get_input: port_pd01_port_mac_requirements
         order:
-          get_input: port_ps02_port_order
+          get_input: port_pd01_port_order
         network_role:
-          get_input: port_ps02_port_network_role
+          get_input: port_pd01_port_network_role
         subnetpoolid:
-          get_input: port_ps02_port_subnetpoolid
+          get_input: port_pd01_port_subnetpoolid
         network:
           get_input:
-          - port_ps02_port_network
+          - port_pd01_port_network
           - index_value
       requirements:
       - binding:
@@ -129,9 +129,6 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
-      binding_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - binding
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -141,15 +138,18 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.incoming.bytes.rate_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.incoming.bytes.rate
+      network.outgoing.packets.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.packets.rate
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
+      network.incoming.bytes_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.bytes
       cpu_pd_server:
       - pd_server
       - cpu
@@ -165,18 +165,21 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
+      network.outgoing.bytes_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
-      network.incoming.packets.rate_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.incoming.packets.rate
       memory.resident_pd_server:
       - pd_server
       - memory.resident
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
+      network.incoming.packets.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
@@ -189,12 +192,12 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
+      attachment_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
-      network.incoming.bytes_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.incoming.bytes
       disk.device.allocation_pd_server:
       - pd_server
       - disk.device.allocation
@@ -207,24 +210,24 @@ topology_template:
       disk.read.requests_pd_server:
       - pd_server
       - disk.read.requests
-      attachment_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - attachment
       feature_pd_server:
       - pd_server
       - feature
       disk.usage_pd_server:
       - pd_server
       - disk.usage
+      binding_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      feature_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - feature
-      network.outgoing.bytes.rate_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.outgoing.bytes.rate
+      network.incoming.bytes.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.bytes.rate
+      network.incoming.packets_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.incoming.packets
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -237,9 +240,6 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
-      network.outgoing.packets.rate_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.outgoing.packets.rate
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -249,8 +249,8 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_ps02_port:
-      - pd_server_ps02_port
+      network.outpoing.packets_pd_server_pd01_port:
+      - pd_server_pd01_port
       - network.outpoing.packets
       disk.write.requests.rate_pd_server:
       - pd_server
@@ -258,12 +258,12 @@ topology_template:
       disk.ephemeral.size_pd_server:
       - pd_server
       - disk.ephemeral.size
-      network.outgoing.bytes_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.outgoing.bytes
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
+      feature_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
@@ -273,9 +273,9 @@ topology_template:
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.incoming.packets_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - network.incoming.packets
+      network.outgoing.bytes.rate_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - network.outgoing.bytes.rate
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
@@ -283,12 +283,12 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_ps02_port:
-      - pd_server_ps02_port
+      link_pd_server_pd01_port:
+      - pd_server_pd01_port
       - link
+      dependency_pd_server_pd01_port:
+      - pd_server_pd01_port
+      - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
-      dependency_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
index 774f8f4..972f5cc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
@@ -18,6 +18,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_ps02_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,46 +33,41 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_ps02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_ps02_port_network_role_tag:
+      type: string
       required: true
-    vm_image_name:
+    port_ps02_port_network_role:
       type: string
       required: true
-    port_pd01_port_ip_requirements:
+    port_ps02_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pd01_port_order:
-      type: integer
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_ps02_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-    port_pd01_port_subnetpoolid:
+    vm_image_name:
       type: string
       required: true
-    port_pd01_port_network_role:
+    port_ps02_port_subnetpoolid:
       type: string
       required: true
-    port_pd01_port_network_role_tag:
-      type: string
+    port_ps02_port_order:
+      type: integer
       required: true
-    port_pd01_port_vlan_requirements:
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    compute_pd_server_user_data_format:
+        type: string
+    port_ps02_port_network:
       type: list
       required: true
       entry_schema:
@@ -92,28 +92,28 @@ topology_template:
           get_input:
           - compute_pd_server_user_data_format
           - index_value
-    pd_server_pd01_port:
+    pd_server_ps02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_pd01_port_exCP_naming
+          get_input: port_ps02_port_exCP_naming
         vlan_requirements:
-          get_input: port_pd01_port_vlan_requirements
+          get_input: port_ps02_port_vlan_requirements
         ip_requirements:
-          get_input: port_pd01_port_ip_requirements
+          get_input: port_ps02_port_ip_requirements
         network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+          get_input: port_ps02_port_network_role_tag
         mac_requirements:
-          get_input: port_pd01_port_mac_requirements
+          get_input: port_ps02_port_mac_requirements
         order:
-          get_input: port_pd01_port_order
+          get_input: port_ps02_port_order
         network_role:
-          get_input: port_pd01_port_network_role
+          get_input: port_ps02_port_network_role
         subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
+          get_input: port_ps02_port_subnetpoolid
         network:
           get_input:
-          - port_pd01_port_network
+          - port_ps02_port_network
           - index_value
       requirements:
       - binding:
@@ -129,6 +129,9 @@ topology_template:
       disk.read.bytes.rate_pd_server:
       - pd_server
       - disk.read.bytes.rate
+      binding_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - binding
       memory.usage_pd_server:
       - pd_server
       - memory.usage
@@ -138,18 +141,15 @@ topology_template:
       disk.device.usage_pd_server:
       - pd_server
       - disk.device.usage
-      network.outgoing.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.incoming.bytes.rate
       os_pd_server:
       - pd_server
       - os
       disk.write.bytes.rate_pd_server:
       - pd_server
       - disk.write.bytes.rate
-      network.incoming.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes
       cpu_pd_server:
       - pd_server
       - cpu
@@ -165,21 +165,18 @@ topology_template:
       disk.device.read.bytes.rate_pd_server:
       - pd_server
       - disk.device.read.bytes.rate
-      network.outgoing.bytes_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes
       disk.iops_pd_server:
       - pd_server
       - disk.iops
+      network.incoming.packets.rate_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.incoming.packets.rate
       memory.resident_pd_server:
       - pd_server
       - memory.resident
       cpu.delta_pd_server:
       - pd_server
       - cpu.delta
-      network.incoming.packets.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets.rate
       vcpus_pd_server:
       - pd_server
       - vcpus
@@ -192,12 +189,12 @@ topology_template:
       endpoint_pd_server:
       - pd_server
       - endpoint
-      attachment_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - attachment
       disk.capacity_pd_server:
       - pd_server
       - disk.capacity
+      network.incoming.bytes_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.incoming.bytes
       disk.device.allocation_pd_server:
       - pd_server
       - disk.device.allocation
@@ -210,24 +207,24 @@ topology_template:
       disk.read.requests_pd_server:
       - pd_server
       - disk.read.requests
+      attachment_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - attachment
       feature_pd_server:
       - pd_server
       - feature
       disk.usage_pd_server:
       - pd_server
       - disk.usage
-      binding_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - binding
       disk.write.bytes_pd_server:
       - pd_server
       - disk.write.bytes
-      network.incoming.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.incoming.packets
+      feature_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - feature
+      network.outgoing.bytes.rate_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.outgoing.bytes.rate
       disk.device.read.requests.rate_pd_server:
       - pd_server
       - disk.device.read.requests.rate
@@ -240,6 +237,9 @@ topology_template:
       disk.device.write.bytes_pd_server:
       - pd_server
       - disk.device.write.bytes
+      network.outgoing.packets.rate_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.outgoing.packets.rate
       disk.device.read.requests_pd_server:
       - pd_server
       - disk.device.read.requests
@@ -249,8 +249,8 @@ topology_template:
       host_pd_server:
       - pd_server
       - host
-      network.outpoing.packets_pd_server_pd01_port:
-      - pd_server_pd01_port
+      network.outpoing.packets_pd_server_ps02_port:
+      - pd_server_ps02_port
       - network.outpoing.packets
       disk.write.requests.rate_pd_server:
       - pd_server
@@ -258,12 +258,12 @@ topology_template:
       disk.ephemeral.size_pd_server:
       - pd_server
       - disk.ephemeral.size
+      network.outgoing.bytes_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.outgoing.bytes
       disk.write.requests_pd_server:
       - pd_server
       - disk.write.requests
-      feature_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - feature
       disk.device.latency_pd_server:
       - pd_server
       - disk.device.latency
@@ -273,9 +273,9 @@ topology_template:
       disk.device.capacity_pd_server:
       - pd_server
       - disk.device.capacity
-      network.outgoing.bytes.rate_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - network.incoming.packets
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
@@ -283,12 +283,12 @@ topology_template:
       local_storage_pd_server:
       - pd_server
       - local_storage
-      link_pd_server_pd01_port:
-      - pd_server_pd01_port
+      link_pd_server_ps02_port:
+      - pd_server_ps02_port
       - link
-      dependency_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - dependency
       dependency_pd_server:
       - pd_server
       - dependency
+      dependency_pd_server_ps02_port:
+      - pd_server_ps02_port
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
index 303a1b0..2d2a3d1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml
@@ -62,30 +62,30 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_ps02_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 1
-        port_ps02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
+          - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_ps02_port_network_role_tag: oam
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_network:
+        - get_input: oam_net_name
+        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
-        port_ps02_port_network:
-        - get_input: oam_net_name
         service_template_filter:
           substitute_service_template: Nested_pd_server_4ServiceTemplate.yaml
           count: 1
@@ -99,30 +99,30 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_ps02_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
+          - 1
+        port_ps02_port_mac_requirements:
           mac_count_required:
             is_required: false
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_ps02_port_network_role_tag: oam
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
+        port_ps02_port_network:
+        - get_input: oam_net_name
         service_template_filter:
           substitute_service_template: Nested_pd_server_5ServiceTemplate.yaml
           count: 1
@@ -153,1024 +153,1024 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      vcpus_server_pd_1_test_nested2Level:
+      cpu_util_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_pd_1
-      network.incoming.bytes.rate_pd02_port_0_test_nested3Level_test_nested2Level:
+      - cpu_util_server_pd_22
+      disk.allocation_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_pd02_port_0_test_nested3Level
-      feature_server_pd_2_test_nested2Level:
+      - disk.allocation_server_pd_21
+      disk.device.read.bytes_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - feature_server_pd_2
-      binding_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_pd_22
+      disk.device.write.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_pd_2_test_nested3Level
-      disk.iops_server_pd_1:
+      - disk.device.write.requests.rate_server_pd_32_test_nested3Level
+      cpu_server_pd_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_pd_32_test_nested3Level
+      disk.device.iops_server_pd_12:
       - abstract_pd_server_5
-      - disk.iops_pd_server
-      disk.iops_server_pd_2:
-      - abstract_pd_server_4
-      - disk.iops_pd_server
-      disk.write.bytes.rate_server_pd_2:
+      - disk.device.iops_pd_server
+      disk.device.iops_server_pd_11:
       - abstract_pd_server_4
-      - disk.write.bytes.rate_pd_server
-      disk.write.bytes.rate_server_pd_1:
-      - abstract_pd_server_5
-      - disk.write.bytes.rate_pd_server
-      disk.read.requests_server_pd_2_test_nested2Level:
-      - test_nested2Level
-      - disk.read.requests_server_pd_2
-      disk.device.iops_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_pd_1
-      network.outgoing.bytes_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.device.iops_pd_server
+      network.outgoing.bytes_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_pd01_port_0_test_nested3Level
-      disk.device.write.bytes.rate_server_pd_1_test_nested2Level:
+      - network.outgoing.bytes_pd02_port_03_test_nested3Level
+      network.incoming.packets_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_pd_1
-      disk.write.bytes_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_pd02_port_02
+      disk.ephemeral.size_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_pd_2_test_nested3Level
-      network.outgoing.packets.rate_pd02_port_0_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_pd_21
+      feature_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_pd02_port_0_test_nested3Level
-      disk.ephemeral.size_server_pd_1_test_nested2Level:
+      - feature_server_pd_31_test_nested3Level
+      host_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_pd_1
-      vcpus_server_pd_2_test_nested2Level:
+      - host_server_pd_22
+      disk.device.write.bytes_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_pd_2
-      feature_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_pd_32_test_nested3Level
+      feature_ps02_port_01:
+      - abstract_pd_server_5
+      - feature_pd_server_ps02_port
+      disk.usage_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - feature_server_pd_2_test_nested3Level
-      disk.device.usage_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.usage_server_pd_21
+      network.incoming.packets.rate_ps02_port_01:
+      - abstract_pd_server_5
+      - network.incoming.packets.rate_pd_server_ps02_port
+      network.outgoing.bytes_pd01_port_01:
+      - abstract_pd_server_4
+      - network.outgoing.bytes_pd_server_pd01_port
+      disk.device.read.bytes.rate_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.read.bytes.rate_pd_server
+      disk.device.usage_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_pd_1_test_nested3Level
-      os_server_pd_1_test_nested2Level:
+      - disk.device.usage_server_pd_22
+      disk.device.read.bytes.rate_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.read.bytes.rate_pd_server
+      disk.device.write.bytes_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_pd_1
-      host_server_pd_2_test_nested2Level:
+      - disk.device.write.bytes_server_pd_31_test_nested3Level
+      network.incoming.bytes.rate_ps02_port_01:
+      - abstract_pd_server_5
+      - network.incoming.bytes.rate_pd_server_ps02_port
+      disk.device.read.requests_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.read.requests_pd_server
+      disk.device.read.requests_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.read.requests_pd_server
+      disk.device.read.requests.rate_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.read.requests.rate_pd_server
+      disk.device.read.requests.rate_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.read.requests.rate_pd_server
+      binding_server_pd_11:
+      - abstract_pd_server_4
+      - binding_pd_server
+      disk.usage_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - host_server_pd_2
-      disk.ephemeral.size_server_pd_2_test_nested2Level:
+      - disk.usage_server_pd_22
+      disk.read.bytes_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_pd_2
-      disk.latency_server_pd_2_test_nested2Level:
+      - disk.read.bytes_server_pd_32_test_nested3Level
+      binding_server_pd_12:
+      - abstract_pd_server_5
+      - binding_pd_server
+      attachment_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_pd_2
-      memory.resident_server_pd_1:
+      - attachment_pd01_port_02
+      network.incoming.bytes_ps02_port_01:
       - abstract_pd_server_5
-      - memory.resident_pd_server
-      os_server_pd_2_test_nested2Level:
+      - network.incoming.bytes_pd_server_ps02_port
+      feature_server_pd_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_server_pd_32_test_nested3Level
+      host_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - os_server_pd_2
-      disk.latency_server_pd_1_test_nested2Level:
+      - host_server_pd_21
+      disk.read.requests_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_pd_1
-      memory.resident_server_pd_2:
+      - disk.read.requests_server_pd_31_test_nested3Level
+      attachment_pd01_port_01:
       - abstract_pd_server_4
-      - memory.resident_pd_server
-      feature_server_pd_1_test_nested3Level_test_nested2Level:
+      - attachment_pd_server_pd01_port
+      disk.write.bytes.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - feature_server_pd_1_test_nested3Level
-      binding_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_pd_21
+      network.outgoing.packets.rate_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_pd_1_test_nested3Level
-      feature_server_pd_1_test_nested2Level:
+      - network.outgoing.packets.rate_pd01_port_03_test_nested3Level
+      scalable_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_pd_1
-      feature_pd01_port_0_test_nested2Level:
+      - scalable_server_pd_32_test_nested3Level
+      scalable_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - feature_pd01_port_0
-      disk.write.bytes_server_pd_1_test_nested3Level_test_nested2Level:
+      - scalable_server_pd_21
+      disk.read.bytes_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_pd_1_test_nested3Level
-      disk.ephemeral.size_server_pd_2:
-      - abstract_pd_server_4
-      - disk.ephemeral.size_pd_server
-      disk.ephemeral.size_server_pd_1:
-      - abstract_pd_server_5
-      - disk.ephemeral.size_pd_server
-      disk.write.bytes.rate_server_pd_1_test_nested2Level:
+      - disk.read.bytes_server_pd_31_test_nested3Level
+      network.incoming.packets_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_pd_1
-      binding_pd01_port_0_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_pd02_port_03_test_nested3Level
+      disk.write.requests_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - binding_pd01_port_0_test_nested3Level
-      binding_pd01_port_0:
-      - abstract_pd_server_5
-      - binding_pd_server_pd01_port
-      host_server_pd_1_test_nested2Level:
+      - disk.write.requests_server_pd_22
+      disk.write.requests.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - host_server_pd_1
-      disk.device.read.bytes_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.read.bytes_pd_server
-      network.incoming.bytes.rate_pd02_port_0_test_nested2Level:
+      - disk.write.requests.rate_server_pd_21
+      disk.device.allocation_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_pd02_port_0
-      disk.device.read.bytes_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.read.bytes_pd_server
-      attachment_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_pd_21
+      disk.read.bytes_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - attachment_pd01_port_0_test_nested3Level
-      instance_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_pd_22
+      disk.usage_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_pd_1_test_nested3Level
-      cpu_util_server_pd_1_test_nested2Level:
+      - disk.usage_server_pd_32_test_nested3Level
+      binding_pd01_port_01:
+      - abstract_pd_server_4
+      - binding_pd_server_pd01_port
+      disk.latency_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_pd_1
-      network.outgoing.packets.rate_pd01_port_0:
+      - disk.latency_server_pd_22
+      binding_ps02_port_01:
       - abstract_pd_server_5
-      - network.outgoing.packets.rate_pd_server_pd01_port
-      disk.write.bytes.rate_server_pd_2_test_nested2Level:
+      - binding_pd_server_ps02_port
+      disk.read.requests_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_pd_2
-      disk.device.latency_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_pd_21
+      feature_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_pd_2_test_nested3Level
-      disk.root.size_server_pd_2_test_nested3Level_test_nested2Level:
+      - feature
+      disk.usage_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_pd_2_test_nested3Level
-      feature_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.usage_server_pd_31_test_nested3Level
+      cpu_util_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_pd01_port_0_test_nested3Level
-      attachment_ps02_port_0:
-      - abstract_pd_server_4
-      - attachment_pd_server_ps02_port
-      disk.capacity_server_pd_1_test_nested2Level:
+      - cpu_util_server_pd_32_test_nested3Level
+      disk.device.iops_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_pd_1
-      network.incoming.packets_pd02_port_0_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_pd_21
+      disk.capacity_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd02_port_0_test_nested3Level
-      attachment_pd02_port_0_test_nested2Level:
+      - disk.capacity_server_pd_32_test_nested3Level
+      instance_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_pd02_port_0
-      disk.device.usage_server_pd_1_test_nested2Level:
+      - instance_server_pd_31_test_nested3Level
+      vcpus_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_pd_1
-      feature_test_nested2Level:
+      - vcpus_server_pd_22
+      network.incoming.packets_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature
-      disk.read.bytes_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_pd01_port_03_test_nested3Level
+      disk.device.capacity_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_pd_2_test_nested3Level
-      disk.read.requests_server_pd_1_test_nested2Level:
+      - disk.device.capacity_server_pd_31_test_nested3Level
+      memory.usage_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_pd_1
-      disk.device.write.bytes_server_pd_1_test_nested2Level:
+      - memory.usage_server_pd_31_test_nested3Level
+      network.outpoing.packets_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_pd_1
-      disk.device.read.bytes_server_pd_2_test_nested2Level:
+      - network.outpoing.packets_pd01_port_02
+      memory.usage_server_pd_12:
+      - abstract_pd_server_5
+      - memory.usage_pd_server
+      disk.latency_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_pd_2
-      instance_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.latency_server_pd_32_test_nested3Level
+      memory.usage_server_pd_11:
+      - abstract_pd_server_4
+      - memory.usage_pd_server
+      disk.read.requests_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_pd_2_test_nested3Level
-      disk.read.bytes_server_pd_1_test_nested2Level:
+      - disk.read.requests_server_pd_32_test_nested3Level
+      cpu_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_pd_1
-      disk.device.usage_server_pd_2_test_nested3Level_test_nested2Level:
+      - cpu_server_pd_31_test_nested3Level
+      memory.usage_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_pd_2_test_nested3Level
-      endpoint_server_pd_1_test_nested2Level:
+      - memory.usage_server_pd_22
+      cpu_util_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_pd_1
-      disk.allocation_server_pd_2_test_nested2Level:
+      - cpu_util_server_pd_31_test_nested3Level
+      disk.latency_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_pd_2
-      disk.read.bytes.rate_server_pd_2:
+      - disk.latency_server_pd_31_test_nested3Level
+      disk.device.read.bytes_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.read.bytes_pd_server
+      disk.device.read.bytes_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.read.bytes_pd_server
+      network.incoming.bytes.rate_pd01_port_01:
+      - abstract_pd_server_4
+      - network.incoming.bytes.rate_pd_server_pd01_port
+      endpoint_server_pd_12:
+      - abstract_pd_server_5
+      - endpoint_pd_server
+      endpoint_server_pd_11:
+      - abstract_pd_server_4
+      - endpoint_pd_server
+      disk.read.bytes.rate_server_pd_11:
       - abstract_pd_server_4
       - disk.read.bytes.rate_pd_server
-      disk.device.read.requests.rate_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_pd_1
-      disk.read.bytes.rate_server_pd_1:
+      disk.read.bytes.rate_server_pd_12:
       - abstract_pd_server_5
       - disk.read.bytes.rate_pd_server
-      cpu_server_pd_2:
+      memory.resident_server_pd_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.resident_server_pd_32_test_nested3Level
+      cpu.delta_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_pd_21
+      endpoint_server_pd_22_test_nested2Level:
+      - test_nested2Level
+      - endpoint_server_pd_22
+      disk.device.write.requests.rate_server_pd_11:
       - abstract_pd_server_4
-      - cpu_pd_server
-      cpu_server_pd_1:
+      - disk.device.write.requests.rate_pd_server
+      disk.latency_server_pd_11:
+      - abstract_pd_server_4
+      - disk.latency_pd_server
+      disk.device.write.requests.rate_server_pd_12:
       - abstract_pd_server_5
-      - cpu_pd_server
-      disk.root.size_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_pd_server
+      memory.usage_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_pd_1_test_nested3Level
-      attachment_pd01_port_0:
+      - memory.usage_server_pd_21
+      disk.latency_server_pd_12:
       - abstract_pd_server_5
-      - attachment_pd_server_pd01_port
-      network.incoming.bytes.rate_pd01_port_0_test_nested2Level:
+      - disk.latency_pd_server
+      network.outgoing.bytes_ps02_port_01:
+      - abstract_pd_server_5
+      - network.outgoing.bytes_pd_server_ps02_port
+      disk.device.write.requests.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_pd01_port_0
-      endpoint_server_pd_2:
+      - disk.device.write.requests.rate_server_pd_21
+      scalable_server_pd_11:
       - abstract_pd_server_4
-      - endpoint_pd_server
-      memory.resident_server_pd_2_test_nested2Level:
-      - test_nested2Level
-      - memory.resident_server_pd_2
-      network.outgoing.packets.rate_pd01_port_0_test_nested3Level_test_nested2Level:
+      - scalable_pd_server
+      disk.device.write.requests_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_pd01_port_0_test_nested3Level
-      endpoint_server_pd_1:
-      - abstract_pd_server_5
-      - endpoint_pd_server
-      vcpus_server_pd_1:
+      - disk.device.write.requests_server_pd_32_test_nested3Level
+      scalable_server_pd_12:
       - abstract_pd_server_5
-      - vcpus_pd_server
-      vcpus_server_pd_2:
+      - scalable_pd_server
+      memory.resident_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - memory.resident_server_pd_21
+      os_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - os_server_pd_21
+      disk.device.write.requests.rate_server_pd_22_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests.rate_server_pd_22
+      disk.device.capacity_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - disk.device.capacity_server_pd_21
+      network.outgoing.packets.rate_pd02_port_03_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_pd02_port_03_test_nested3Level
+      endpoint_server_pd_31_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - endpoint_server_pd_31_test_nested3Level
+      network.outgoing.bytes.rate_pd01_port_01:
       - abstract_pd_server_4
-      - vcpus_pd_server
-      disk.read.bytes.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_pd_server_pd01_port
+      disk.write.requests_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_pd_2_test_nested3Level
-      endpoint_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_pd_21
+      disk.write.bytes.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_pd_2_test_nested3Level
-      disk.write.requests_server_pd_1_test_nested2Level:
+      - disk.write.bytes.rate_server_pd_22
+      disk.write.requests.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_pd_1
-      disk.device.write.bytes_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_pd_22
+      network.outgoing.bytes.rate_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_pd_2_test_nested3Level
-      network.outgoing.bytes_pd01_port_0_test_nested2Level:
+      - network.outgoing.bytes.rate_pd01_port_03_test_nested3Level
+      disk.device.allocation_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.allocation_pd_server
+      disk.device.read.bytes.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_pd01_port_0
-      disk.device.write.requests_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes.rate_server_pd_22
+      disk.write.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_pd_2_test_nested3Level
-      network.incoming.bytes_pd01_port_0_test_nested2Level:
+      - disk.write.bytes.rate_server_pd_31_test_nested3Level
+      disk.device.write.requests_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_pd01_port_0
-      disk.device.write.bytes.rate_server_pd_1:
+      - disk.device.write.requests_server_pd_21
+      disk.device.allocation_server_pd_12:
       - abstract_pd_server_5
-      - disk.device.write.bytes.rate_pd_server
-      cpu_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - cpu_server_pd_1
-      disk.device.write.bytes.rate_server_pd_2:
+      - disk.device.allocation_pd_server
+      network.outgoing.packets.rate_pd01_port_01:
       - abstract_pd_server_4
-      - disk.device.write.bytes.rate_pd_server
-      disk.ephemeral.size_server_pd_1_test_nested3Level_test_nested2Level:
+      - network.outgoing.packets.rate_pd_server_pd01_port
+      disk.device.latency_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_pd_1_test_nested3Level
-      disk.write.requests.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_pd_32_test_nested3Level
+      binding_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_pd_1_test_nested3Level
-      disk.write.requests.rate_server_pd_2_test_nested2Level:
+      - binding_server_pd_22
+      disk.iops_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_pd_2
-      network.incoming.bytes.rate_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.iops_server_pd_32_test_nested3Level
+      disk.device.usage_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_pd01_port_0_test_nested3Level
-      disk.device.write.requests.rate_server_pd_1_test_nested2Level:
+      - disk.device.usage_server_pd_32_test_nested3Level
+      disk.device.usage_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_pd_1
-      disk.write.bytes_server_pd_2_test_nested2Level:
+      - disk.device.usage_server_pd_21
+      disk.device.read.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_pd_2
-      network.outgoing.bytes.rate_pd01_port_0_test_nested2Level:
+      - disk.device.read.requests.rate_server_pd_31_test_nested3Level
+      disk.write.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_pd01_port_0
-      cpu.delta_server_pd_2_test_nested2Level:
+      - disk.write.requests.rate_server_pd_32_test_nested3Level
+      disk.write.requests_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_pd_2
-      network.incoming.bytes.rate_pd01_port_0:
+      - disk.write.requests_server_pd_31_test_nested3Level
+      disk.write.requests_server_pd_12:
       - abstract_pd_server_5
-      - network.incoming.bytes.rate_pd_server_pd01_port
-      disk.latency_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.requests_pd_server
+      disk.write.requests_server_pd_11:
+      - abstract_pd_server_4
+      - disk.write.requests_pd_server
+      memory_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_pd_1_test_nested3Level
-      feature_pd02_port_0_test_nested2Level:
+      - memory_server_pd_32_test_nested3Level
+      network.incoming.bytes_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_pd02_port_0
-      cpu_util_server_pd_1_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_pd01_port_03_test_nested3Level
+      feature_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_pd_1_test_nested3Level
-      disk.device.allocation_server_pd_1_test_nested2Level:
+      - feature_pd01_port_03_test_nested3Level
+      network.outgoing.packets.rate_ps02_port_01:
+      - abstract_pd_server_5
+      - network.outgoing.packets.rate_pd_server_ps02_port
+      network.outgoing.bytes_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_pd_1
-      disk.device.read.bytes_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_pd01_port_03_test_nested3Level
+      disk.device.allocation_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_pd_2_test_nested3Level
-      disk.iops_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_pd_22
+      disk.device.read.bytes_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_pd_2_test_nested3Level
-      instance_server_pd_1:
+      - disk.device.read.bytes_server_pd_21
+      memory.resident_server_pd_12:
       - abstract_pd_server_5
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.read.requests.rate_pd_server
-      network.incoming.packets_pd02_port_0_test_nested2Level:
+      - memory.resident_pd_server
+      memory_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd02_port_0
-      instance_server_pd_2:
+      - memory_server_pd_22
+      memory.resident_server_pd_11:
       - abstract_pd_server_4
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.read.requests.rate_pd_server
-      disk.capacity_server_pd_1_test_nested3Level_test_nested2Level:
+      - memory.resident_pd_server
+      feature_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_pd_1_test_nested3Level
-      network.outgoing.packets.rate_pd02_port_0_test_nested2Level:
+      - feature_pd02_port_02
+      disk.ephemeral.size_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_pd02_port_0
-      binding_ps02_port_0:
-      - abstract_pd_server_4
-      - binding_pd_server_ps02_port
-      disk.write.bytes.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_pd_31_test_nested3Level
+      feature_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_pd_2_test_nested3Level
-      cpu_util_server_pd_1:
-      - abstract_pd_server_5
-      - cpu_util_pd_server
-      cpu_util_server_pd_2:
-      - abstract_pd_server_4
-      - cpu_util_pd_server
-      disk.device.read.bytes.rate_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.read.bytes.rate_pd_server
-      disk.capacity_server_pd_2_test_nested2Level:
-      - test_nested2Level
-      - disk.capacity_server_pd_2
-      disk.allocation_server_pd_2:
-      - abstract_pd_server_4
-      - disk.allocation_pd_server
-      disk.device.write.bytes_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.write.bytes_pd_server
-      disk.device.write.bytes_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.write.bytes_pd_server
-      disk.allocation_server_pd_1:
-      - abstract_pd_server_5
-      - disk.allocation_pd_server
-      network.incoming.packets.rate_pd01_port_0:
-      - abstract_pd_server_5
-      - network.incoming.packets.rate_pd_server_pd01_port
-      disk.capacity_server_pd_2:
-      - abstract_pd_server_4
-      - disk.capacity_pd_server
-      disk.read.bytes_server_pd_2_test_nested2Level:
+      - feature_pd01_port_02
+      disk.device.read.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_pd_2
-      disk.capacity_server_pd_1:
-      - abstract_pd_server_5
-      - disk.capacity_pd_server
-      disk.allocation_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes.rate_server_pd_31_test_nested3Level
+      network.incoming.packets_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_pd_2_test_nested3Level
-      disk.device.read.bytes.rate_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.read.bytes.rate_pd_server
-      os_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_pd01_port_02
+      disk.device.write.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_pd_2_test_nested3Level
-      network.outgoing.packets.rate_ps02_port_0:
-      - abstract_pd_server_4
-      - network.outgoing.packets.rate_pd_server_ps02_port
-      cpu.delta_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_pd_31_test_nested3Level
+      disk.ephemeral.size_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_pd_1_test_nested3Level
-      disk.device.allocation_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_pd_22
+      disk.device.iops_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_pd_1_test_nested3Level
-      network.outpoing.packets_pd01_port_0:
-      - abstract_pd_server_5
-      - network.outpoing.packets_pd_server_pd01_port
-      binding_server_pd_2:
-      - abstract_pd_server_4
-      - binding_pd_server
-      disk.device.write.requests_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.write.requests_pd_server
-      binding_server_pd_1:
-      - abstract_pd_server_5
-      - binding_pd_server
-      disk.device.write.requests_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.write.requests_pd_server
-      disk.usage_server_pd_1_test_nested2Level:
+      - disk.device.iops_server_pd_22
+      disk.device.write.bytes_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_pd_1
-      binding_pd02_port_0_test_nested2Level:
+      - disk.device.write.bytes_server_pd_21
+      network.incoming.packets.rate_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_pd02_port_0
-      disk.write.requests_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_pd02_port_03_test_nested3Level
+      network.outgoing.bytes_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_pd_2_test_nested3Level
-      network.incoming.packets.rate_pd01_port_0_test_nested2Level:
+      - network.outgoing.bytes_pd02_port_02
+      network.outpoing.packets_pd01_port_01:
+      - abstract_pd_server_4
+      - network.outpoing.packets_pd_server_pd01_port
+      disk.allocation_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_pd01_port_0
-      network.incoming.bytes.rate_ps02_port_0:
+      - disk.allocation_server_pd_31_test_nested3Level
+      disk.device.capacity_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.capacity_pd_server
+      disk.device.capacity_server_pd_11:
       - abstract_pd_server_4
-      - network.incoming.bytes.rate_pd_server_ps02_port
-      disk.device.write.requests.rate_server_pd_2:
+      - disk.device.capacity_pd_server
+      instance_server_pd_22_test_nested2Level:
+      - test_nested2Level
+      - instance_server_pd_22
+      binding_server_pd_31_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_server_pd_31_test_nested3Level
+      disk.read.requests_server_pd_11:
       - abstract_pd_server_4
-      - disk.device.write.requests.rate_pd_server
-      disk.read.bytes_server_pd_1:
+      - disk.read.requests_pd_server
+      disk.read.requests_server_pd_12:
       - abstract_pd_server_5
-      - disk.read.bytes_pd_server
-      disk.device.iops_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.read.requests_pd_server
+      disk.write.bytes_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_pd_1_test_nested3Level
-      cpu_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_pd_32_test_nested3Level
+      network.outpoing.packets_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_pd_1_test_nested3Level
-      disk.device.read.requests_server_pd_1:
+      - network.outpoing.packets_pd01_port_03_test_nested3Level
+      attachment_ps02_port_01:
       - abstract_pd_server_5
-      - disk.device.read.requests_pd_server
-      disk.root.size_server_pd_2_test_nested2Level:
+      - attachment_pd_server_ps02_port
+      network.incoming.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_pd_2
-      disk.device.read.requests_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.read.requests_pd_server
-      disk.read.bytes_server_pd_2:
+      - network.incoming.bytes.rate_pd02_port_03_test_nested3Level
+      disk.write.requests.rate_server_pd_11:
       - abstract_pd_server_4
-      - disk.read.bytes_pd_server
-      disk.device.write.requests.rate_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.write.requests.rate_pd_server
-      host_server_pd_1_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - host_server_pd_1_test_nested3Level
-      vcpus_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_pd_server
+      os_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_pd_2_test_nested3Level
-      network.outpoing.packets_ps02_port_0:
-      - abstract_pd_server_4
-      - network.outpoing.packets_pd_server_ps02_port
-      endpoint_server_pd_2_test_nested2Level:
+      - os_server_pd_31_test_nested3Level
+      host_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_pd_2
-      disk.read.requests_server_pd_1_test_nested3Level_test_nested2Level:
+      - host_server_pd_32_test_nested3Level
+      disk.device.read.requests_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_pd_1_test_nested3Level
-      memory.resident_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_pd_32_test_nested3Level
+      disk.write.requests.rate_server_pd_12:
+      - abstract_pd_server_5
+      - disk.write.requests.rate_pd_server
+      disk.root.size_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_pd_2_test_nested3Level
-      disk.read.bytes.rate_server_pd_1_test_nested2Level:
+      - disk.root.size_server_pd_22
+      memory_server_pd_12:
+      - abstract_pd_server_5
+      - memory_pd_server
+      memory_server_pd_11:
+      - abstract_pd_server_4
+      - memory_pd_server
+      network.incoming.packets.rate_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_pd_1
-      disk.root.size_server_pd_1_test_nested2Level:
+      - network.incoming.packets.rate_pd01_port_03_test_nested3Level
+      disk.allocation_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_pd_1
-      host_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.allocation_server_pd_32_test_nested3Level
+      os_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_pd_2_test_nested3Level
-      memory_server_pd_2_test_nested2Level:
+      - os_server_pd_32_test_nested3Level
+      disk.device.latency_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.latency_pd_server
+      disk.root.size_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_pd_2
-      disk.device.capacity_server_pd_1_test_nested2Level:
+      - disk.root.size_server_pd_32_test_nested3Level
+      disk.write.bytes_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_pd_1
-      binding_server_pd_2_test_nested2Level:
+      - disk.write.bytes_server_pd_21
+      vcpus_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_pd_2
-      cpu.delta_server_pd_2:
+      - vcpus_server_pd_31_test_nested3Level
+      disk.device.latency_server_pd_11:
       - abstract_pd_server_4
-      - cpu.delta_pd_server
-      disk.usage_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.latency_pd_server
+      disk.device.write.bytes_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_pd_2_test_nested3Level
-      feature_server_pd_2:
+      - disk.device.write.bytes_server_pd_22
+      disk.device.usage_server_pd_11:
       - abstract_pd_server_4
-      - feature_pd_server
-      feature_server_pd_1:
-      - abstract_pd_server_5
-      - feature_pd_server
-      scalable_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_pd_1
-      cpu.delta_server_pd_1:
-      - abstract_pd_server_5
-      - cpu.delta_pd_server
-      host_server_pd_1:
+      - disk.device.usage_pd_server
+      disk.device.usage_server_pd_12:
       - abstract_pd_server_5
-      - host_pd_server
-      binding_pd01_port_0_test_nested2Level:
+      - disk.device.usage_pd_server
+      disk.device.read.requests.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - binding_pd01_port_0
-      host_server_pd_2:
-      - abstract_pd_server_4
-      - host_pd_server
-      memory.usage_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_pd_22
+      disk.read.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_pd_1_test_nested3Level
-      network.outgoing.bytes_pd01_port_0:
+      - disk.read.bytes.rate_server_pd_32_test_nested3Level
+      disk.write.bytes_server_pd_12:
       - abstract_pd_server_5
-      - network.outgoing.bytes_pd_server_pd01_port
-      disk.device.read.requests.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_pd_server
+      cpu_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_pd_2_test_nested3Level
-      disk.device.read.requests_server_pd_2_test_nested3Level_test_nested2Level:
+      - cpu_server_pd_22
+      disk.write.bytes_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_pd_2_test_nested3Level
-      memory.usage_server_pd_2_test_nested2Level:
+      - disk.write.bytes_server_pd_22
+      disk.device.read.requests_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_pd_2
-      disk.device.read.bytes.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_pd_22
+      network.outgoing.bytes.rate_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_pd_1_test_nested3Level
-      memory_server_pd_2:
+      - network.outgoing.bytes.rate_pd02_port_02
+      disk.write.bytes_server_pd_11:
       - abstract_pd_server_4
-      - memory_pd_server
-      binding_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - binding_server_pd_1
-      memory_server_pd_1:
-      - abstract_pd_server_5
-      - memory_pd_server
-      disk.device.read.requests.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_pd_server
+      disk.device.read.requests_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_pd_1_test_nested3Level
-      os_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_pd_21
+      disk.device.read.requests.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - os_server_pd_1_test_nested3Level
-      disk.allocation_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_pd_21
+      disk.root.size_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_pd_1_test_nested3Level
-      network.outgoing.bytes.rate_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_pd_21
+      disk.device.read.requests_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_pd01_port_0_test_nested3Level
-      network.outpoing.packets_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_pd_31_test_nested3Level
+      disk.device.read.requests.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_pd01_port_0_test_nested3Level
-      memory.usage_server_pd_1_test_nested2Level:
+      - disk.device.read.requests.rate_server_pd_32_test_nested3Level
+      binding_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_pd_1
-      disk.read.bytes.rate_server_pd_2_test_nested2Level:
+      - binding_server_pd_32_test_nested3Level
+      instance_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_pd_2
-      feature_ps02_port_0:
+      - instance_server_pd_21
+      disk.write.bytes.rate_server_pd_12:
+      - abstract_pd_server_5
+      - disk.write.bytes.rate_pd_server
+      disk.write.bytes.rate_server_pd_11:
       - abstract_pd_server_4
-      - feature_pd_server_ps02_port
-      disk.device.capacity_server_pd_2_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.capacity_server_pd_2_test_nested3Level
-      disk.device.read.requests_server_pd_1_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_pd_1_test_nested3Level
-      network.outgoing.packets.rate_pd01_port_0_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_pd01_port_0
-      memory_server_pd_1_test_nested2Level:
+      - disk.write.bytes.rate_pd_server
+      network.incoming.bytes.rate_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_pd_1
-      disk.device.read.bytes.rate_server_pd_2_test_nested2Level:
+      - network.incoming.bytes.rate_pd01_port_03_test_nested3Level
+      network.incoming.packets.rate_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_pd_2
-      disk.write.requests_server_pd_1:
+      - network.incoming.packets.rate_pd01_port_02
+      network.incoming.packets_ps02_port_01:
       - abstract_pd_server_5
-      - disk.write.requests_pd_server
-      scalable_server_pd_2_test_nested2Level:
+      - network.incoming.packets_pd_server_ps02_port
+      disk.device.iops_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_pd_2
-      disk.write.requests_server_pd_2:
+      - disk.device.iops_server_pd_31_test_nested3Level
+      disk.root.size_server_pd_11:
       - abstract_pd_server_4
-      - disk.write.requests_pd_server
-      disk.write.bytes_server_pd_1:
+      - disk.root.size_pd_server
+      disk.root.size_server_pd_12:
       - abstract_pd_server_5
-      - disk.write.bytes_pd_server
-      network.outpoing.packets_pd01_port_0_test_nested2Level:
-      - test_nested2Level
-      - network.outpoing.packets_pd01_port_0
-      cpu_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.root.size_pd_server
+      attachment_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - cpu_server_pd_2_test_nested3Level
-      disk.write.bytes_server_pd_2:
-      - abstract_pd_server_4
-      - disk.write.bytes_pd_server
-      disk.read.requests_server_pd_1:
+      - attachment_pd02_port_02
+      disk.iops_server_pd_12:
       - abstract_pd_server_5
-      - disk.read.requests_pd_server
-      disk.read.requests_server_pd_2:
-      - abstract_pd_server_4
-      - disk.read.requests_pd_server
-      disk.device.usage_server_pd_2:
+      - disk.iops_pd_server
+      disk.iops_server_pd_11:
       - abstract_pd_server_4
-      - disk.device.usage_pd_server
-      disk.device.usage_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.usage_pd_server
-      network.incoming.bytes_pd02_port_0_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_pd02_port_0_test_nested3Level
-      disk.device.read.bytes.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.iops_pd_server
+      os_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_pd_2_test_nested3Level
-      disk.device.write.bytes.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - os_server_pd_22
+      cpu.delta_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_pd_1_test_nested3Level
-      disk.capacity_server_pd_2_test_nested3Level_test_nested2Level:
+      - cpu.delta_server_pd_31_test_nested3Level
+      disk.root.size_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_pd_2_test_nested3Level
-      disk.write.requests.rate_server_pd_1:
+      - disk.root.size_server_pd_31_test_nested3Level
+      network.outgoing.bytes.rate_ps02_port_01:
       - abstract_pd_server_5
-      - disk.write.requests.rate_pd_server
-      disk.write.requests.rate_server_pd_2:
+      - network.outgoing.bytes.rate_pd_server_ps02_port
+      disk.iops_server_pd_22_test_nested2Level:
+      - test_nested2Level
+      - disk.iops_server_pd_22
+      feature_pd01_port_01:
       - abstract_pd_server_4
-      - disk.write.requests.rate_pd_server
-      disk.root.size_server_pd_1:
+      - feature_pd_server_pd01_port
+      disk.device.write.bytes.rate_server_pd_12:
       - abstract_pd_server_5
-      - disk.root.size_pd_server
-      memory_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_pd_server
+      disk.device.write.bytes.rate_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.write.bytes.rate_pd_server
+      disk.device.allocation_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_pd_2_test_nested3Level
-      cpu.delta_server_pd_1_test_nested2Level:
+      - disk.device.allocation_server_pd_32_test_nested3Level
+      attachment_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_pd_1
-      instance_server_pd_1_test_nested2Level:
+      - attachment_pd02_port_03_test_nested3Level
+      cpu_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - instance_server_pd_1
-      binding_pd02_port_0_test_nested3Level_test_nested2Level:
+      - cpu_server_pd_21
+      disk.device.usage_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_pd02_port_0_test_nested3Level
-      disk.device.write.requests.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_pd_31_test_nested3Level
+      binding_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_pd_2_test_nested3Level
-      network.incoming.packets.rate_ps02_port_0:
+      - binding_pd02_port_03_test_nested3Level
+      disk.read.bytes_server_pd_12:
+      - abstract_pd_server_5
+      - disk.read.bytes_pd_server
+      disk.read.bytes_server_pd_11:
       - abstract_pd_server_4
-      - network.incoming.packets.rate_pd_server_ps02_port
-      network.outgoing.bytes.rate_pd02_port_0_test_nested2Level:
+      - disk.read.bytes_pd_server
+      network.outpoing.packets_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_pd02_port_0
-      disk.device.iops_server_pd_1:
+      - network.outpoing.packets_pd02_port_02
+      binding_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - binding_server_pd_21
+      network.incoming.packets_pd01_port_01:
+      - abstract_pd_server_4
+      - network.incoming.packets_pd_server_pd01_port
+      network.incoming.packets.rate_pd01_port_01:
+      - abstract_pd_server_4
+      - network.incoming.packets.rate_pd_server_pd01_port
+      cpu_util_server_pd_12:
       - abstract_pd_server_5
-      - disk.device.iops_pd_server
-      network.outgoing.bytes_pd02_port_0_test_nested2Level:
+      - cpu_util_pd_server
+      disk.device.latency_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_pd02_port_0
-      network.outgoing.bytes.rate_ps02_port_0:
+      - disk.device.latency_server_pd_22
+      cpu_util_server_pd_11:
       - abstract_pd_server_4
-      - network.outgoing.bytes.rate_pd_server_ps02_port
-      disk.device.read.bytes.rate_server_pd_1_test_nested2Level:
+      - cpu_util_pd_server
+      disk.device.allocation_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_pd_1
-      disk.device.iops_server_pd_2:
+      - disk.device.allocation_server_pd_31_test_nested3Level
+      feature_server_pd_11:
       - abstract_pd_server_4
-      - disk.device.iops_pd_server
-      disk.device.capacity_server_pd_2_test_nested2Level:
+      - feature_pd_server
+      feature_server_pd_12:
+      - abstract_pd_server_5
+      - feature_pd_server
+      host_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_pd_2
-      disk.iops_server_pd_2_test_nested2Level:
+      - host_server_pd_31_test_nested3Level
+      disk.device.iops_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_pd_2
-      endpoint_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_pd_32_test_nested3Level
+      network.outpoing.packets_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_pd_1_test_nested3Level
-      memory_server_pd_1_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_pd02_port_03_test_nested3Level
+      cpu.delta_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_pd_1_test_nested3Level
-      scalable_server_pd_2_test_nested3Level_test_nested2Level:
+      - cpu.delta_server_pd_32_test_nested3Level
+      feature_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - scalable_server_pd_2_test_nested3Level
-      disk.device.write.requests_server_pd_2_test_nested2Level:
+      - feature_server_pd_21
+      attachment_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_pd_2
-      disk.device.capacity_server_pd_1_test_nested3Level_test_nested2Level:
+      - attachment_pd01_port_03_test_nested3Level
+      disk.device.read.bytes_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_pd_1_test_nested3Level
-      attachment_pd01_port_0_test_nested2Level:
+      - disk.device.read.bytes_server_pd_31_test_nested3Level
+      memory_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - attachment_pd01_port_0
-      disk.root.size_server_pd_2:
-      - abstract_pd_server_4
-      - disk.root.size_pd_server
-      disk.usage_server_pd_2_test_nested2Level:
+      - memory_server_pd_21
+      binding_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_pd_2
-      disk.usage_server_pd_2:
-      - abstract_pd_server_4
-      - disk.usage_pd_server
-      disk.usage_server_pd_1:
-      - abstract_pd_server_5
-      - disk.usage_pd_server
-      disk.write.bytes_server_pd_1_test_nested2Level:
+      - binding_pd01_port_03_test_nested3Level
+      disk.capacity_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_pd_1
-      disk.device.latency_server_pd_1_test_nested2Level:
+      - disk.capacity_server_pd_21
+      disk.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_pd_1
-      cpu_util_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_pd_32_test_nested3Level
+      disk.read.bytes.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_pd_2_test_nested3Level
-      disk.device.write.requests_server_pd_1_test_nested2Level:
+      - disk.read.bytes.rate_server_pd_21
+      disk.device.write.bytes.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_pd_1
-      network.outgoing.bytes_ps02_port_0:
-      - abstract_pd_server_4
-      - network.outgoing.bytes_pd_server_ps02_port
-      disk.device.read.requests_server_pd_2_test_nested2Level:
+      - disk.device.write.bytes.rate_server_pd_21
+      disk.device.write.requests_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_pd_2
-      disk.device.capacity_server_pd_2:
+      - disk.device.write.requests_server_pd_31_test_nested3Level
+      disk.device.capacity_server_pd_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.capacity_server_pd_32_test_nested3Level
+      cpu.delta_server_pd_11:
       - abstract_pd_server_4
-      - disk.device.capacity_pd_server
-      disk.device.capacity_server_pd_1:
+      - cpu.delta_pd_server
+      host_server_pd_11:
+      - abstract_pd_server_4
+      - host_pd_server
+      cpu.delta_server_pd_12:
       - abstract_pd_server_5
-      - disk.device.capacity_pd_server
-      disk.device.read.bytes_server_pd_1_test_nested3Level_test_nested2Level:
+      - cpu.delta_pd_server
+      host_server_pd_12:
+      - abstract_pd_server_5
+      - host_pd_server
+      network.outgoing.bytes.rate_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_pd_1_test_nested3Level
-      feature_pd02_port_0_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_pd02_port_03_test_nested3Level
+      cpu.delta_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - feature_pd02_port_0_test_nested3Level
-      disk.device.allocation_server_pd_2_test_nested2Level:
+      - cpu.delta_server_pd_22
+      disk.ephemeral.size_server_pd_11:
+      - abstract_pd_server_4
+      - disk.ephemeral.size_pd_server
+      disk.read.bytes.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_pd_2
-      network.outpoing.packets_pd02_port_0_test_nested3Level_test_nested2Level:
+      - disk.read.bytes.rate_server_pd_22
+      network.incoming.packets.rate_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_pd02_port_0_test_nested3Level
-      disk.iops_server_pd_1_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_pd02_port_02
+      disk.write.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_pd_1_test_nested3Level
-      disk.read.bytes_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_pd_31_test_nested3Level
+      disk.ephemeral.size_server_pd_12:
+      - abstract_pd_server_5
+      - disk.ephemeral.size_pd_server
+      disk.device.read.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_pd_1_test_nested3Level
-      disk.write.requests_server_pd_2_test_nested2Level:
+      - disk.device.read.bytes.rate_server_pd_32_test_nested3Level
+      memory.usage_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_pd_2
-      disk.device.write.bytes_server_pd_1_test_nested3Level_test_nested2Level:
+      - memory.usage_server_pd_32_test_nested3Level
+      instance_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_pd_1_test_nested3Level
-      disk.device.latency_server_pd_2_test_nested2Level:
+      - instance_server_pd_32_test_nested3Level
+      memory.resident_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_pd_2
-      disk.device.write.requests.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - memory.resident_server_pd_22
+      disk.device.latency_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_pd_1_test_nested3Level
-      feature_pd01_port_0:
-      - abstract_pd_server_5
-      - feature_pd_server_pd01_port
-      disk.device.latency_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.latency_pd_server
-      disk.read.bytes.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_pd_31_test_nested3Level
+      disk.capacity_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_pd_1_test_nested3Level
-      vcpus_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_pd_22
+      scalable_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_pd_1_test_nested3Level
-      disk.device.latency_server_pd_1:
+      - scalable_server_pd_31_test_nested3Level
+      network.incoming.bytes_pd01_port_01:
+      - abstract_pd_server_4
+      - network.incoming.bytes_pd_server_pd01_port
+      network.outpoing.packets_ps02_port_01:
       - abstract_pd_server_5
-      - disk.device.latency_pd_server
-      disk.write.requests.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_pd_server_ps02_port
+      disk.device.write.bytes.rate_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_pd_2_test_nested3Level
-      disk.write.requests.rate_server_pd_1_test_nested2Level:
+      - disk.device.write.bytes.rate_server_pd_32_test_nested3Level
+      disk.device.write.requests_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_pd_1
-      network.incoming.packets_pd01_port_0_test_nested2Level:
+      - disk.device.write.requests_server_pd_22
+      disk.device.read.bytes_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd01_port_0
-      disk.device.write.requests.rate_server_pd_2_test_nested2Level:
+      - disk.device.read.bytes_server_pd_32_test_nested3Level
+      network.outgoing.bytes.rate_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_pd_2
-      network.outpoing.packets_pd02_port_0_test_nested2Level:
+      - network.outgoing.bytes.rate_pd01_port_02
+      disk.device.read.bytes.rate_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_pd02_port_0
-      disk.device.latency_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes.rate_server_pd_21
+      disk.device.write.requests_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.write.requests_pd_server
+      network.incoming.bytes.rate_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_pd_1_test_nested3Level
-      cpu.delta_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes.rate_pd02_port_02
+      disk.device.write.requests_server_pd_11:
+      - abstract_pd_server_4
+      - disk.device.write.requests_pd_server
+      instance_server_pd_11:
+      - abstract_pd_server_4
+      - instance_pd_server
+      memory.resident_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_pd_2_test_nested3Level
-      disk.ephemeral.size_server_pd_2_test_nested3Level_test_nested2Level:
+      - memory.resident_server_pd_31_test_nested3Level
+      instance_server_pd_12:
+      - abstract_pd_server_5
+      - instance_pd_server
+      os_server_pd_11:
+      - abstract_pd_server_4
+      - os_pd_server
+      os_server_pd_12:
+      - abstract_pd_server_5
+      - os_pd_server
+      disk.device.write.bytes.rate_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_pd_2_test_nested3Level
-      disk.device.write.requests_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_pd_22
+      disk.capacity_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_pd_1_test_nested3Level
-      network.outgoing.bytes_pd02_port_0_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_pd_31_test_nested3Level
+      endpoint_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_pd02_port_0_test_nested3Level
-      scalable_server_pd_1_test_nested3Level_test_nested2Level:
+      - endpoint_server_pd_21
+      scalable_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - scalable_server_pd_1_test_nested3Level
-      disk.device.write.bytes.rate_server_pd_2_test_nested3Level_test_nested2Level:
+      - scalable_server_pd_22
+      feature_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_pd_2_test_nested3Level
-      disk.device.read.requests_server_pd_1_test_nested2Level:
+      - feature_pd02_port_03_test_nested3Level
+      vcpus_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_pd_1
-      disk.write.bytes.rate_server_pd_1_test_nested3Level_test_nested2Level:
+      - vcpus_server_pd_32_test_nested3Level
+      network.incoming.bytes_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_pd_1_test_nested3Level
-      network.incoming.packets.rate_pd02_port_0_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_pd02_port_03_test_nested3Level
+      memory_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_pd02_port_0_test_nested3Level
-      disk.device.read.requests.rate_server_pd_2_test_nested2Level:
+      - memory_server_pd_31_test_nested3Level
+      vcpus_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_pd_2
-      disk.device.write.bytes_server_pd_2_test_nested2Level:
+      - vcpus_server_pd_21
+      disk.latency_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_pd_2
-      disk.allocation_server_pd_1_test_nested2Level:
+      - disk.latency_server_pd_21
+      binding_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_pd_1
-      network.outgoing.bytes.rate_pd01_port_0:
-      - abstract_pd_server_5
-      - network.outgoing.bytes.rate_pd_server_pd01_port
-      memory.resident_server_pd_1_test_nested3Level_test_nested2Level:
+      - binding_pd01_port_02
+      disk.capacity_server_pd_11:
+      - abstract_pd_server_4
+      - disk.capacity_pd_server
+      feature_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_pd_1_test_nested3Level
-      disk.device.read.bytes_server_pd_1_test_nested2Level:
+      - feature_server_pd_22
+      disk.iops_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_pd_1
-      network.incoming.bytes_ps02_port_0:
-      - abstract_pd_server_4
-      - network.incoming.bytes_pd_server_ps02_port
-      network.incoming.bytes_pd01_port_0:
-      - abstract_pd_server_5
-      - network.incoming.bytes_pd_server_pd01_port
-      disk.device.iops_server_pd_2_test_nested3Level_test_nested2Level:
+      - disk.iops_server_pd_21
+      binding_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_pd_2_test_nested3Level
-      network.incoming.bytes_pd01_port_0_test_nested3Level_test_nested2Level:
+      - binding_pd02_port_02
+      disk.device.capacity_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_pd01_port_0_test_nested3Level
-      network.incoming.packets_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_pd_22
+      endpoint_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_pd01_port_0_test_nested3Level
-      disk.read.requests_server_pd_2_test_nested3Level_test_nested2Level:
+      - endpoint_server_pd_32_test_nested3Level
+      disk.capacity_server_pd_12:
+      - abstract_pd_server_5
+      - disk.capacity_pd_server
+      network.incoming.bytes_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_pd_2_test_nested3Level
-      disk.iops_server_pd_1_test_nested2Level:
+      - network.incoming.bytes_pd01_port_02
+      disk.ephemeral.size_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_pd_1
-      disk.write.requests_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_pd_32_test_nested3Level
+      network.incoming.bytes.rate_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_pd_1_test_nested3Level
-      instance_server_pd_2_test_nested2Level:
+      - network.incoming.bytes.rate_pd01_port_02
+      disk.read.bytes.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_pd_2
-      network.incoming.packets_pd01_port_0:
-      - abstract_pd_server_5
-      - network.incoming.packets_pd_server_pd01_port
-      attachment_pd02_port_0_test_nested3Level_test_nested2Level:
+      - disk.read.bytes.rate_server_pd_31_test_nested3Level
+      disk.device.write.requests.rate_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_pd02_port_0_test_nested3Level
-      cpu_util_server_pd_2_test_nested2Level:
+      - disk.device.write.requests.rate_server_pd_31_test_nested3Level
+      disk.iops_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_pd_2
-      network.incoming.packets.rate_pd01_port_0_test_nested3Level_test_nested2Level:
+      - disk.iops_server_pd_31_test_nested3Level
+      disk.write.requests_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_pd01_port_0_test_nested3Level
-      disk.device.allocation_server_pd_1:
-      - abstract_pd_server_5
-      - disk.device.allocation_pd_server
-      disk.device.allocation_server_pd_2:
-      - abstract_pd_server_4
-      - disk.device.allocation_pd_server
-      memory.usage_server_pd_2:
-      - abstract_pd_server_4
-      - memory.usage_pd_server
-      disk.usage_server_pd_1_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_pd_32_test_nested3Level
+      network.incoming.bytes_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_pd_1_test_nested3Level
-      network.incoming.packets.rate_pd02_port_0_test_nested2Level:
+      - network.incoming.bytes_pd02_port_02
+      cpu_util_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_pd02_port_0
+      - cpu_util_server_pd_21
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
-      network.incoming.bytes_pd02_port_0_test_nested2Level:
+      disk.allocation_server_pd_22_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_pd_22
+      network.outgoing.packets.rate_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_pd02_port_0
-      memory.usage_server_pd_1:
+      - network.outgoing.packets.rate_pd01_port_02
+      disk.read.bytes_server_pd_21_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes_server_pd_21
+      disk.usage_server_pd_12:
       - abstract_pd_server_5
-      - memory.usage_pd_server
-      os_server_pd_2:
-      - abstract_pd_server_4
-      - os_pd_server
-      disk.latency_server_pd_1:
+      - disk.usage_pd_server
+      vcpus_server_pd_12:
       - abstract_pd_server_5
-      - disk.latency_pd_server
-      disk.latency_server_pd_2:
+      - vcpus_pd_server
+      disk.usage_server_pd_11:
       - abstract_pd_server_4
-      - disk.latency_pd_server
-      disk.device.usage_server_pd_2_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_pd_2
-      disk.device.allocation_server_pd_2_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_pd_2_test_nested3Level
-      network.outgoing.bytes.rate_pd02_port_0_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.bytes.rate_pd02_port_0_test_nested3Level
-      scalable_server_pd_2:
+      - disk.usage_pd_server
+      vcpus_server_pd_11:
       - abstract_pd_server_4
-      - scalable_pd_server
-      scalable_server_pd_1:
-      - abstract_pd_server_5
-      - scalable_pd_server
-      disk.latency_server_pd_2_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_pd_2_test_nested3Level
-      network.incoming.packets_ps02_port_0:
+      - vcpus_pd_server
+      disk.device.write.bytes_server_pd_11:
       - abstract_pd_server_4
-      - network.incoming.packets_pd_server_ps02_port
-      memory.resident_server_pd_1_test_nested2Level:
-      - test_nested2Level
-      - memory.resident_server_pd_1
-      disk.device.write.bytes.rate_server_pd_2_test_nested2Level:
+      - disk.device.write.bytes_pd_server
+      disk.allocation_server_pd_11:
+      - abstract_pd_server_4
+      - disk.allocation_pd_server
+      network.outgoing.packets.rate_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_pd_2
-      disk.device.iops_server_pd_2_test_nested2Level:
+      - network.outgoing.packets.rate_pd02_port_02
+      disk.allocation_server_pd_12:
+      - abstract_pd_server_5
+      - disk.allocation_pd_server
+      disk.device.write.bytes_server_pd_12:
+      - abstract_pd_server_5
+      - disk.device.write.bytes_pd_server
+      network.outgoing.bytes_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_pd_2
-      memory.usage_server_pd_2_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_pd01_port_02
+      disk.device.latency_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_pd_2_test_nested3Level
-      cpu_server_pd_2_test_nested2Level:
+      - disk.device.latency_server_pd_21
+      disk.read.requests_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - cpu_server_pd_2
-      os_server_pd_1:
+      - disk.read.requests_server_pd_22
+      cpu_server_pd_12:
       - abstract_pd_server_5
-      - os_pd_server
+      - cpu_pd_server
+      cpu_server_pd_11:
+      - abstract_pd_server_4
+      - cpu_pd_server
+      disk.write.bytes_server_pd_31_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_pd_31_test_nested3Level
     requirements:
-      dependency_pd02_port_0_test_nested2Level:
+      link_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_pd02_port_0
-      dependency_pd02_port_0_test_nested3Level_test_nested2Level:
+      - link_pd02_port_03_test_nested3Level
+      link_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - dependency_pd02_port_0_test_nested3Level
-      local_storage_server_pd_1:
-      - abstract_pd_server_5
-      - local_storage_pd_server
-      local_storage_server_pd_2:
-      - abstract_pd_server_4
-      - local_storage_pd_server
-      local_storage_server_pd_1_test_nested3Level_test_nested2Level:
+      - link_pd01_port_02
+      dependency_pd02_port_02_test_nested2Level:
+      - test_nested2Level
+      - dependency_pd02_port_02
+      dependency_pd01_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_pd_1_test_nested3Level
+      - dependency_pd01_port_03_test_nested3Level
       dependency_test_nested2Level:
       - test_nested2Level
       - dependency
-      dependency_server_pd_1:
-      - abstract_pd_server_5
-      - dependency_pd_server
-      dependency_server_pd_2:
-      - abstract_pd_server_4
-      - dependency_pd_server
-      dependency_server_pd_2_test_nested3Level_test_nested2Level:
+      local_storage_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_pd_2_test_nested3Level
-      link_pd01_port_0_test_nested2Level:
+      - local_storage_server_pd_32_test_nested3Level
+      local_storage_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - link_pd01_port_0
-      local_storage_server_pd_2_test_nested2Level:
+      - local_storage_server_pd_21
+      dependency_server_pd_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_pd_2
-      dependency_pd01_port_0_test_nested3Level_test_nested2Level:
+      - dependency_server_pd_32_test_nested3Level
+      dependency_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - dependency_pd01_port_0_test_nested3Level
-      link_pd02_port_0_test_nested2Level:
-      - test_nested2Level
-      - link_pd02_port_0
-      local_storage_server_pd_2_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_pd_2_test_nested3Level
-      link_pd01_port_0:
+      - dependency_server_pd_22
+      dependency_ps02_port_01:
       - abstract_pd_server_5
-      - link_pd_server_pd01_port
-      link_ps02_port_0:
+      - dependency_pd_server_ps02_port
+      dependency_pd01_port_01:
       - abstract_pd_server_4
-      - link_pd_server_ps02_port
-      dependency_server_pd_2_test_nested2Level:
+      - dependency_pd_server_pd01_port
+      local_storage_server_pd_11:
+      - abstract_pd_server_4
+      - local_storage_pd_server
+      link_pd01_port_03_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - link_pd01_port_03_test_nested3Level
+      local_storage_server_pd_31_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_pd_31_test_nested3Level
+      local_storage_server_pd_22_test_nested2Level:
       - test_nested2Level
-      - dependency_server_pd_2
-      local_storage_server_pd_1_test_nested2Level:
+      - local_storage_server_pd_22
+      dependency_pd02_port_03_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_pd_1
-      dependency_ps02_port_0:
+      - dependency_pd02_port_03_test_nested3Level
+      link_pd01_port_01:
       - abstract_pd_server_4
-      - dependency_pd_server_ps02_port
-      dependency_pd01_port_0:
+      - link_pd_server_pd01_port
+      local_storage_server_pd_12:
       - abstract_pd_server_5
-      - dependency_pd_server_pd01_port
-      dependency_server_pd_1_test_nested2Level:
+      - local_storage_pd_server
+      dependency_server_pd_11:
+      - abstract_pd_server_4
+      - dependency_pd_server
+      link_pd02_port_02_test_nested2Level:
       - test_nested2Level
-      - dependency_server_pd_1
-      link_pd01_port_0_test_nested3Level_test_nested2Level:
+      - link_pd02_port_02
+      dependency_pd01_port_02_test_nested2Level:
       - test_nested2Level
-      - link_pd01_port_0_test_nested3Level
-      dependency_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_test_nested3Level
-      link_pd02_port_0_test_nested3Level_test_nested2Level:
+      - dependency_pd01_port_02
+      link_ps02_port_01:
+      - abstract_pd_server_5
+      - link_pd_server_ps02_port
+      dependency_server_pd_12:
+      - abstract_pd_server_5
+      - dependency_pd_server
+      dependency_server_pd_31_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_pd02_port_0_test_nested3Level
-      dependency_pd01_port_0_test_nested2Level:
+      - dependency_server_pd_31_test_nested3Level
+      dependency_server_pd_21_test_nested2Level:
       - test_nested2Level
-      - dependency_pd01_port_0
-      dependency_server_pd_1_test_nested3Level_test_nested2Level:
+      - dependency_server_pd_21
+      dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_pd_1_test_nested3Level
+      - 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/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
index f837190..3674d56 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml
@@ -153,682 +153,682 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      disk.read.bytes.rate_server_pd_2_test_nested3Level:
+      disk.write.bytes.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_pd_2
-      disk.root.size_server_pd_2_test_nested3Level:
+      - disk.write.bytes.rate_server_pd_32
+      endpoint_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_pd_2
-      disk.iops_server_pd_1:
-      - abstract_pd_server_3
-      - disk.iops_pd_server
-      disk.iops_server_pd_2:
-      - abstract_pd_server_2
-      - disk.iops_pd_server
-      binding_pd01_port_0_test_nested3Level:
+      - endpoint_server_pd_31
+      network.outgoing.bytes_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - binding_pd01_port_0
-      disk.write.bytes.rate_server_pd_2:
-      - abstract_pd_server_2
-      - disk.write.bytes.rate_pd_server
-      network.outpoing.packets_pd01_port_0_test_nested3Level:
+      - network.outgoing.bytes_pd02_port_03
+      scalable_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_pd01_port_0
-      disk.write.bytes.rate_server_pd_1:
+      - scalable_server_pd_32
+      disk.device.read.requests_server_pd_21:
       - abstract_pd_server_3
-      - disk.write.bytes.rate_pd_server
-      disk.device.capacity_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.device.capacity_server_pd_2
-      scalable_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_pd_2
-      network.incoming.packets.rate_pd02_port_0_test_nested3Level:
+      - disk.device.read.requests_pd_server
+      disk.device.read.requests_server_pd_22:
+      - abstract_pd_server_2
+      - disk.device.read.requests_pd_server
+      disk.write.requests.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_pd02_port_0
-      network.outgoing.bytes_pd02_port_0:
+      - disk.write.requests.rate_server_pd_32
+      disk.allocation_server_pd_21:
+      - abstract_pd_server_3
+      - disk.allocation_pd_server
+      disk.allocation_server_pd_22:
       - abstract_pd_server_2
-      - network.outgoing.bytes_pd_server_pd02_port
-      scalable_server_pd_1_test_nested3Level:
+      - disk.allocation_pd_server
+      disk.device.read.requests.rate_server_pd_21:
+      - abstract_pd_server_3
+      - disk.device.read.requests.rate_pd_server
+      scalable_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - scalable_server_pd_1
-      disk.read.bytes.rate_server_pd_1_test_nested3Level:
+      - scalable_server_pd_31
+      disk.device.allocation_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_pd_1
-      memory.resident_server_pd_1:
-      - abstract_pd_server_3
-      - memory.resident_pd_server
-      memory.resident_server_pd_2:
+      - disk.device.allocation_server_pd_32
+      disk.device.read.requests.rate_server_pd_22:
       - abstract_pd_server_2
-      - memory.resident_pd_server
-      network.incoming.bytes_pd02_port_0:
+      - disk.device.read.requests.rate_pd_server
+      binding_server_pd_22:
       - abstract_pd_server_2
-      - network.incoming.bytes_pd_server_pd02_port
-      disk.ephemeral.size_server_pd_2:
+      - binding_pd_server
+      memory.usage_server_pd_22:
       - abstract_pd_server_2
-      - disk.ephemeral.size_pd_server
-      disk.ephemeral.size_server_pd_1:
+      - memory.usage_pd_server
+      binding_server_pd_21:
       - abstract_pd_server_3
-      - disk.ephemeral.size_pd_server
-      binding_pd01_port_0:
+      - binding_pd_server
+      memory.usage_server_pd_21:
       - abstract_pd_server_3
-      - binding_pd_server_pd01_port
-      network.outgoing.bytes.rate_pd02_port_0_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_pd02_port_0
-      disk.device.read.bytes_server_pd_1:
+      - memory.usage_pd_server
+      network.outgoing.bytes_pd01_port_02:
       - abstract_pd_server_3
-      - disk.device.read.bytes_pd_server
-      disk.device.read.bytes_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.read.bytes_pd_server
-      feature_pd02_port_0_test_nested3Level:
+      - network.outgoing.bytes_pd_server_pd01_port
+      disk.device.read.bytes.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - feature_pd02_port_0
-      binding_server_pd_1_test_nested3Level:
+      - disk.device.read.bytes.rate_server_pd_31
+      feature_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - binding_server_pd_1
-      network.outgoing.packets.rate_pd01_port_0:
-      - abstract_pd_server_3
-      - network.outgoing.packets.rate_pd_server_pd01_port
-      instance_server_pd_2_test_nested3Level:
+      - feature_pd02_port_03
+      disk.read.requests_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - instance_server_pd_2
-      memory.resident_server_pd_1_test_nested3Level:
+      - disk.read.requests_server_pd_32
+      network.incoming.packets.rate_pd02_port_02:
+      - abstract_pd_server_2
+      - network.incoming.packets.rate_pd_server_pd02_port
+      network.outpoing.packets_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_pd_1
-      cpu.delta_server_pd_1_test_nested3Level:
+      - network.outpoing.packets_pd02_port_03
+      disk.read.bytes.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_pd_1
-      memory_server_pd_1_test_nested3Level:
+      - disk.read.bytes.rate_server_pd_31
+      feature_pd02_port_02:
+      - abstract_pd_server_2
+      - feature_pd_server_pd02_port
+      disk.read.bytes.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - memory_server_pd_1
-      memory.usage_server_pd_2_test_nested3Level:
+      - disk.read.bytes.rate_server_pd_32
+      disk.write.requests.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_pd_2
-      disk.usage_server_pd_1_test_nested3Level:
+      - disk.write.requests.rate_server_pd_31
+      attachment_pd01_port_02:
+      - abstract_pd_server_3
+      - attachment_pd_server_pd01_port
+      binding_pd01_port_02:
+      - abstract_pd_server_3
+      - binding_pd_server_pd01_port
+      disk.allocation_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - disk.allocation_server_pd_32
+      os_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_pd_1
-      disk.iops_server_pd_1_test_nested3Level:
+      - os_server_pd_31
+      disk.usage_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_pd_1
-      disk.device.allocation_server_pd_2_test_nested3Level:
+      - disk.usage_server_pd_31
+      disk.ephemeral.size_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_pd_2
-      disk.write.requests.rate_server_pd_2_test_nested3Level:
+      - disk.ephemeral.size_server_pd_32
+      disk.device.iops_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_pd_2
-      disk.read.bytes.rate_server_pd_2:
+      - disk.device.iops_server_pd_32
+      network.outpoing.packets_pd02_port_02:
       - abstract_pd_server_2
-      - disk.read.bytes.rate_pd_server
-      disk.read.bytes.rate_server_pd_1:
-      - abstract_pd_server_3
-      - disk.read.bytes.rate_pd_server
-      cpu_server_pd_2:
+      - network.outpoing.packets_pd_server_pd02_port
+      network.incoming.bytes_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_pd01_port_03
+      network.incoming.bytes.rate_pd02_port_02:
       - abstract_pd_server_2
-      - cpu_pd_server
-      cpu_server_pd_1:
-      - abstract_pd_server_3
-      - cpu_pd_server
-      attachment_pd01_port_0:
-      - abstract_pd_server_3
-      - attachment_pd_server_pd01_port
-      disk.device.capacity_server_pd_1_test_nested3Level:
+      - network.incoming.bytes.rate_pd_server_pd02_port
+      host_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_pd_1
-      endpoint_server_pd_2:
+      - host_server_pd_31
+      disk.write.bytes.rate_server_pd_31_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes.rate_server_pd_31
+      disk.device.iops_server_pd_22:
       - abstract_pd_server_2
-      - endpoint_pd_server
-      endpoint_server_pd_1:
+      - disk.device.iops_pd_server
+      disk.device.iops_server_pd_21:
       - abstract_pd_server_3
-      - endpoint_pd_server
-      vcpus_server_pd_1:
+      - disk.device.iops_pd_server
+      disk.ephemeral.size_server_pd_21:
       - abstract_pd_server_3
-      - vcpus_pd_server
-      vcpus_server_pd_2:
+      - disk.ephemeral.size_pd_server
+      disk.device.read.bytes.rate_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_pd_32
+      disk.ephemeral.size_server_pd_22:
       - abstract_pd_server_2
-      - vcpus_pd_server
-      attachment_pd01_port_0_test_nested3Level:
+      - disk.ephemeral.size_pd_server
+      endpoint_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - attachment_pd01_port_0
-      disk.write.requests_server_pd_2_test_nested3Level:
+      - endpoint_server_pd_32
+      cpu_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_pd_2
-      network.incoming.bytes_pd01_port_0_test_nested3Level:
+      - cpu_server_pd_31
+      memory_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_pd01_port_0
-      disk.device.write.bytes.rate_server_pd_1:
+      - memory_server_pd_32
+      network.incoming.bytes.rate_pd01_port_02:
       - abstract_pd_server_3
-      - disk.device.write.bytes.rate_pd_server
-      disk.device.write.bytes.rate_server_pd_2:
+      - network.incoming.bytes.rate_pd_server_pd01_port
+      binding_pd02_port_02:
       - abstract_pd_server_2
-      - disk.device.write.bytes.rate_pd_server
-      disk.device.usage_server_pd_1_test_nested3Level:
+      - binding_pd_server_pd02_port
+      memory.resident_server_pd_21:
+      - abstract_pd_server_3
+      - memory.resident_pd_server
+      disk.device.usage_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_pd_1
-      disk.device.write.requests.rate_server_pd_2_test_nested3Level:
+      - disk.device.usage_server_pd_32
+      memory.resident_server_pd_22:
+      - abstract_pd_server_2
+      - memory.resident_pd_server
+      disk.device.usage_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_pd_2
-      network.incoming.bytes.rate_pd01_port_0:
+      - disk.device.usage_server_pd_31
+      feature_server_pd_22:
+      - abstract_pd_server_2
+      - feature_pd_server
+      feature_server_pd_21:
       - abstract_pd_server_3
-      - network.incoming.bytes.rate_pd_server_pd01_port
-      disk.device.write.requests.rate_server_pd_1_test_nested3Level:
+      - feature_pd_server
+      disk.device.read.bytes_server_pd_22:
+      - abstract_pd_server_2
+      - disk.device.read.bytes_pd_server
+      disk.device.read.bytes_server_pd_21:
+      - abstract_pd_server_3
+      - disk.device.read.bytes_pd_server
+      network.incoming.packets_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_pd_1
-      disk.write.bytes_server_pd_2_test_nested3Level:
+      - network.incoming.packets_pd01_port_03
+      binding_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_pd_2
-      disk.device.read.bytes.rate_server_pd_1_test_nested3Level:
+      - binding_server_pd_32
+      disk.device.write.bytes_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_pd_1
-      disk.device.read.requests.rate_server_pd_1_test_nested3Level:
+      - disk.device.write.bytes_server_pd_31
+      disk.device.read.bytes_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_pd_1
-      network.incoming.bytes.rate_pd02_port_0_test_nested3Level:
+      - disk.device.read.bytes_server_pd_32
+      network.incoming.packets_pd02_port_02:
+      - abstract_pd_server_2
+      - network.incoming.packets_pd_server_pd02_port
+      disk.device.read.bytes_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_pd02_port_0
-      disk.device.write.bytes_server_pd_1_test_nested3Level:
+      - disk.device.read.bytes_server_pd_31
+      feature_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes_server_pd_1
-      instance_server_pd_1:
+      - feature_pd01_port_03
+      disk.device.write.requests.rate_server_pd_22:
+      - abstract_pd_server_2
+      - disk.device.write.requests.rate_pd_server
+      network.outgoing.bytes.rate_pd01_port_02:
       - abstract_pd_server_3
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_1:
+      - network.outgoing.bytes.rate_pd_server_pd01_port
+      disk.device.write.requests.rate_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.read.requests.rate_pd_server
-      disk.device.latency_server_pd_1_test_nested3Level:
+      - disk.device.write.requests.rate_pd_server
+      disk.device.write.requests.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_pd_1
-      instance_server_pd_2:
-      - abstract_pd_server_2
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.read.requests.rate_pd_server
-      disk.write.requests_server_pd_1_test_nested3Level:
+      - disk.device.write.requests.rate_server_pd_32
+      feature_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_pd_1
-      attachment_pd02_port_0:
-      - abstract_pd_server_2
-      - attachment_pd_server_pd02_port
-      cpu_util_server_pd_1:
-      - abstract_pd_server_3
-      - cpu_util_pd_server
-      host_server_pd_2_test_nested3Level:
+      - feature_server_pd_31
+      attachment_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - host_server_pd_2
-      cpu_util_server_pd_2:
-      - abstract_pd_server_2
-      - cpu_util_pd_server
-      disk.device.read.bytes.rate_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.read.bytes.rate_pd_server
-      disk.device.allocation_server_pd_1_test_nested3Level:
+      - attachment_pd02_port_03
+      memory.usage_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_pd_1
-      disk.allocation_server_pd_2:
-      - abstract_pd_server_2
-      - disk.allocation_pd_server
-      disk.device.write.bytes_server_pd_1:
+      - memory.usage_server_pd_32
+      disk.device.allocation_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.write.bytes_pd_server
-      disk.device.write.bytes_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.write.bytes_pd_server
-      disk.allocation_server_pd_1:
-      - abstract_pd_server_3
-      - disk.allocation_pd_server
-      network.incoming.packets.rate_pd01_port_0:
-      - abstract_pd_server_3
-      - network.incoming.packets.rate_pd_server_pd01_port
-      disk.capacity_server_pd_2:
+      - disk.device.allocation_pd_server
+      disk.device.allocation_server_pd_22:
       - abstract_pd_server_2
-      - disk.capacity_pd_server
-      disk.capacity_server_pd_1:
-      - abstract_pd_server_3
-      - disk.capacity_pd_server
-      disk.device.read.bytes.rate_server_pd_1:
-      - abstract_pd_server_3
-      - disk.device.read.bytes.rate_pd_server
-      cpu.delta_server_pd_2_test_nested3Level:
+      - disk.device.allocation_pd_server
+      disk.write.requests_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_pd_2
-      binding_pd02_port_0_test_nested3Level:
+      - disk.write.requests_server_pd_32
+      disk.read.requests_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - binding_pd02_port_0
-      network.outpoing.packets_pd01_port_0:
-      - abstract_pd_server_3
-      - network.outpoing.packets_pd_server_pd01_port
-      binding_server_pd_2:
-      - abstract_pd_server_2
-      - binding_pd_server
-      disk.device.write.requests_server_pd_2:
+      - disk.read.requests_server_pd_31
+      disk.write.bytes.rate_server_pd_22:
       - abstract_pd_server_2
-      - disk.device.write.requests_pd_server
-      binding_server_pd_1:
-      - abstract_pd_server_3
-      - binding_pd_server
-      disk.device.write.requests_server_pd_1:
+      - disk.write.bytes.rate_pd_server
+      disk.write.bytes.rate_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.write.requests_pd_server
-      disk.usage_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_pd_2
-      disk.capacity_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_pd_2
-      disk.device.write.requests.rate_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.write.requests.rate_pd_server
-      network.outgoing.packets.rate_pd02_port_0_test_nested3Level:
+      - disk.write.bytes.rate_pd_server
+      os_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_pd02_port_0
-      disk.read.bytes_server_pd_1:
+      - os_server_pd_32
+      network.outgoing.packets.rate_pd01_port_02:
       - abstract_pd_server_3
-      - disk.read.bytes_pd_server
-      disk.device.read.requests_server_pd_1:
-      - abstract_pd_server_3
-      - disk.device.read.requests_pd_server
-      cpu_server_pd_1_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_pd_1
-      disk.device.read.requests_server_pd_2:
+      - network.outgoing.packets.rate_pd_server_pd01_port
+      network.incoming.bytes_pd02_port_02:
       - abstract_pd_server_2
-      - disk.device.read.requests_pd_server
-      disk.read.bytes_server_pd_2:
+      - network.incoming.bytes_pd_server_pd02_port
+      endpoint_server_pd_22:
       - abstract_pd_server_2
-      - disk.read.bytes_pd_server
-      disk.device.write.requests.rate_server_pd_1:
-      - abstract_pd_server_3
-      - disk.device.write.requests.rate_pd_server
-      feature_server_pd_1_test_nested3Level:
-      - test_nested3Level
-      - feature_server_pd_1
-      memory_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - memory_server_pd_2
-      vcpus_server_pd_1_test_nested3Level:
+      - endpoint_pd_server
+      disk.write.bytes_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_pd_1
-      disk.write.bytes.rate_server_pd_2_test_nested3Level:
+      - disk.write.bytes_server_pd_32
+      endpoint_server_pd_21:
+      - abstract_pd_server_3
+      - endpoint_pd_server
+      disk.device.read.requests.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes.rate_server_pd_2
-      instance_server_pd_1_test_nested3Level:
+      - disk.device.read.requests.rate_server_pd_32
+      disk.latency_server_pd_21:
+      - abstract_pd_server_3
+      - disk.latency_pd_server
+      disk.latency_server_pd_22:
+      - abstract_pd_server_2
+      - disk.latency_pd_server
+      attachment_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - instance_server_pd_1
-      network.outgoing.bytes_pd01_port_0_test_nested3Level:
+      - attachment_pd01_port_03
+      instance_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_pd01_port_0
-      feature_pd01_port_0_test_nested3Level:
+      - instance_server_pd_32
+      disk.allocation_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - feature_pd01_port_0
-      disk.ephemeral.size_server_pd_1_test_nested3Level:
+      - disk.allocation_server_pd_31
+      memory.resident_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_pd_1
-      vcpus_server_pd_2_test_nested3Level:
+      - memory.resident_server_pd_31
+      disk.device.capacity_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_pd_2
-      os_server_pd_1_test_nested3Level:
+      - disk.device.capacity_server_pd_31
+      disk.write.requests_server_pd_21:
+      - abstract_pd_server_3
+      - disk.write.requests_pd_server
+      cpu.delta_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - os_server_pd_1
-      disk.device.write.bytes.rate_server_pd_1_test_nested3Level:
+      - cpu.delta_server_pd_31
+      host_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_pd_1
-      cpu.delta_server_pd_2:
+      - host_server_pd_32
+      disk.write.requests_server_pd_22:
       - abstract_pd_server_2
-      - cpu.delta_pd_server
-      feature_server_pd_2:
-      - abstract_pd_server_2
-      - feature_pd_server
-      feature_server_pd_1:
-      - abstract_pd_server_3
-      - feature_pd_server
-      cpu.delta_server_pd_1:
+      - disk.write.requests_pd_server
+      disk.read.bytes_server_pd_21:
       - abstract_pd_server_3
-      - cpu.delta_pd_server
-      disk.device.iops_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_pd_2
-      disk.device.write.bytes.rate_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_pd_2
-      host_server_pd_1:
+      - disk.read.bytes_pd_server
+      memory_server_pd_22:
+      - abstract_pd_server_2
+      - memory_pd_server
+      disk.read.bytes_server_pd_22:
+      - abstract_pd_server_2
+      - disk.read.bytes_pd_server
+      memory_server_pd_21:
       - abstract_pd_server_3
-      - host_pd_server
-      disk.device.iops_server_pd_1_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_pd_1
-      disk.ephemeral.size_server_pd_2_test_nested3Level:
+      - memory_pd_server
+      network.outgoing.packets.rate_pd02_port_02:
+      - abstract_pd_server_2
+      - network.outgoing.packets.rate_pd_server_pd02_port
+      disk.device.write.requests_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_pd_2
-      host_server_pd_2:
+      - disk.device.write.requests_server_pd_31
+      attachment_pd02_port_02:
       - abstract_pd_server_2
-      - host_pd_server
-      network.outgoing.bytes_pd01_port_0:
+      - attachment_pd_server_pd02_port
+      network.outpoing.packets_pd01_port_02:
       - abstract_pd_server_3
-      - network.outgoing.bytes_pd_server_pd01_port
-      os_server_pd_2_test_nested3Level:
+      - network.outpoing.packets_pd_server_pd01_port
+      network.incoming.packets_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - os_server_pd_2
-      disk.read.bytes_server_pd_1_test_nested3Level:
+      - network.incoming.packets_pd02_port_03
+      disk.iops_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_pd_1
-      memory_server_pd_2:
+      - disk.iops_server_pd_32
+      disk.write.bytes_server_pd_22:
       - abstract_pd_server_2
-      - memory_pd_server
-      memory_server_pd_1:
+      - disk.write.bytes_pd_server
+      disk.write.bytes_server_pd_21:
       - abstract_pd_server_3
-      - memory_pd_server
-      network.incoming.packets_pd02_port_0:
+      - disk.write.bytes_pd_server
+      disk.root.size_server_pd_21:
+      - abstract_pd_server_3
+      - disk.root.size_pd_server
+      disk.root.size_server_pd_22:
       - abstract_pd_server_2
-      - network.incoming.packets_pd_server_pd02_port
-      disk.read.requests_server_pd_2_test_nested3Level:
+      - disk.root.size_pd_server
+      disk.capacity_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_pd_2
-      cpu_util_server_pd_1_test_nested3Level:
+      - disk.capacity_server_pd_31
+      network.outgoing.packets.rate_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - cpu_util_server_pd_1
-      disk.read.requests_server_pd_1_test_nested3Level:
+      - network.outgoing.packets.rate_pd01_port_03
+      network.incoming.bytes_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_pd_1
-      disk.read.bytes_server_pd_2_test_nested3Level:
+      - network.incoming.bytes_pd02_port_03
+      disk.device.write.bytes.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_pd_2
-      disk.write.requests_server_pd_1:
-      - abstract_pd_server_3
-      - disk.write.requests_pd_server
-      endpoint_server_pd_2_test_nested3Level:
+      - disk.device.write.bytes.rate_server_pd_31
+      disk.device.write.requests.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_pd_2
-      disk.write.requests_server_pd_2:
+      - disk.device.write.requests.rate_server_pd_31
+      disk.device.capacity_server_pd_22:
       - abstract_pd_server_2
-      - disk.write.requests_pd_server
-      disk.write.bytes_server_pd_1:
+      - disk.device.capacity_pd_server
+      disk.device.capacity_server_pd_21:
       - abstract_pd_server_3
-      - disk.write.bytes_pd_server
-      disk.write.bytes_server_pd_2:
-      - abstract_pd_server_2
-      - disk.write.bytes_pd_server
-      disk.read.requests_server_pd_1:
+      - disk.device.capacity_pd_server
+      disk.read.requests_server_pd_21:
       - abstract_pd_server_3
       - disk.read.requests_pd_server
-      network.outgoing.bytes.rate_pd02_port_0:
-      - abstract_pd_server_2
-      - network.outgoing.bytes.rate_pd_server_pd02_port
-      disk.read.requests_server_pd_2:
+      disk.read.requests_server_pd_22:
       - abstract_pd_server_2
       - disk.read.requests_pd_server
-      disk.device.usage_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.usage_pd_server
-      disk.device.usage_server_pd_1:
+      disk.write.requests.rate_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.usage_pd_server
-      network.incoming.packets.rate_pd02_port_0:
-      - abstract_pd_server_2
-      - network.incoming.packets.rate_pd_server_pd02_port
-      network.incoming.bytes_pd02_port_0_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_pd02_port_0
-      network.incoming.packets.rate_pd01_port_0_test_nested3Level:
+      - disk.write.requests.rate_pd_server
+      disk.device.latency_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_pd01_port_0
-      disk.device.read.requests_server_pd_1_test_nested3Level:
+      - disk.device.latency_server_pd_32
+      disk.read.bytes_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_pd_1
-      disk.write.requests.rate_server_pd_1:
-      - abstract_pd_server_3
-      - disk.write.requests.rate_pd_server
-      disk.write.requests.rate_server_pd_2:
+      - disk.read.bytes_server_pd_31
+      disk.write.requests.rate_server_pd_22:
       - abstract_pd_server_2
       - disk.write.requests.rate_pd_server
-      disk.root.size_server_pd_1:
-      - abstract_pd_server_3
-      - disk.root.size_pd_server
-      disk.allocation_server_pd_1_test_nested3Level:
+      disk.device.latency_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_pd_1
-      host_server_pd_1_test_nested3Level:
-      - test_nested3Level
-      - host_server_pd_1
-      disk.device.iops_server_pd_1:
+      - disk.device.latency_server_pd_31
+      disk.device.latency_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.iops_pd_server
-      disk.device.iops_server_pd_2:
+      - disk.device.latency_pd_server
+      disk.device.write.requests_server_pd_21:
+      - abstract_pd_server_3
+      - disk.device.write.requests_pd_server
+      disk.device.latency_server_pd_22:
       - abstract_pd_server_2
-      - disk.device.iops_pd_server
-      network.incoming.packets_pd02_port_0_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_pd02_port_0
-      disk.write.bytes.rate_server_pd_1_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_pd_1
-      feature_pd02_port_0:
+      - disk.device.latency_pd_server
+      disk.device.usage_server_pd_22:
       - abstract_pd_server_2
-      - feature_pd_server_pd02_port
-      network.incoming.packets_pd01_port_0_test_nested3Level:
+      - disk.device.usage_pd_server
+      cpu.delta_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_pd01_port_0
-      disk.root.size_server_pd_2:
+      - cpu.delta_server_pd_32
+      disk.device.usage_server_pd_21:
+      - abstract_pd_server_3
+      - disk.device.usage_pd_server
+      cpu_util_server_pd_21:
+      - abstract_pd_server_3
+      - cpu_util_pd_server
+      cpu_util_server_pd_22:
       - abstract_pd_server_2
-      - disk.root.size_pd_server
-      disk.latency_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - disk.latency_server_pd_2
-      disk.usage_server_pd_2:
+      - cpu_util_pd_server
+      disk.device.write.requests_server_pd_22:
       - abstract_pd_server_2
-      - disk.usage_pd_server
-      disk.usage_server_pd_1:
+      - disk.device.write.requests_pd_server
+      feature_pd01_port_02:
       - abstract_pd_server_3
-      - disk.usage_pd_server
-      disk.device.write.requests_server_pd_1_test_nested3Level:
+      - feature_pd_server_pd01_port
+      memory.usage_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_pd_1
-      feature_server_pd_2_test_nested3Level:
+      - memory.usage_server_pd_31
+      disk.read.bytes_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - feature_server_pd_2
-      disk.device.read.bytes_server_pd_1_test_nested3Level:
+      - disk.read.bytes_server_pd_32
+      network.outgoing.bytes_pd02_port_02:
+      - abstract_pd_server_2
+      - network.outgoing.bytes_pd_server_pd02_port
+      disk.device.read.requests.rate_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_pd_1
-      disk.device.latency_server_pd_2_test_nested3Level:
+      - disk.device.read.requests.rate_server_pd_31
+      vcpus_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_pd_2
-      network.outgoing.bytes.rate_pd01_port_0_test_nested3Level:
+      - vcpus_server_pd_31
+      disk.read.bytes.rate_server_pd_21:
+      - abstract_pd_server_3
+      - disk.read.bytes.rate_pd_server
+      disk.device.capacity_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_pd01_port_0
-      disk.device.write.requests_server_pd_2_test_nested3Level:
+      - disk.device.capacity_server_pd_32
+      disk.read.bytes.rate_server_pd_22:
+      - abstract_pd_server_2
+      - disk.read.bytes.rate_pd_server
+      disk.latency_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_pd_2
-      disk.device.capacity_server_pd_2:
+      - disk.latency_server_pd_31
+      network.incoming.packets.rate_pd01_port_02:
+      - abstract_pd_server_3
+      - network.incoming.packets.rate_pd_server_pd01_port
+      network.incoming.packets_pd01_port_02:
+      - abstract_pd_server_3
+      - network.incoming.packets_pd_server_pd01_port
+      disk.iops_server_pd_22:
       - abstract_pd_server_2
-      - disk.device.capacity_pd_server
-      disk.device.capacity_server_pd_1:
+      - disk.iops_pd_server
+      cpu.delta_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.capacity_pd_server
-      cpu_server_pd_2_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_pd_2
-      disk.device.usage_server_pd_2_test_nested3Level:
+      - cpu.delta_pd_server
+      cpu.delta_server_pd_22:
+      - abstract_pd_server_2
+      - cpu.delta_pd_server
+      disk.iops_server_pd_21:
+      - abstract_pd_server_3
+      - disk.iops_pd_server
+      memory.resident_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_pd_2
-      network.incoming.bytes.rate_pd01_port_0_test_nested3Level:
+      - memory.resident_server_pd_32
+      disk.device.write.requests_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_pd01_port_0
-      disk.device.write.bytes_server_pd_2_test_nested3Level:
+      - disk.device.write.requests_server_pd_32
+      disk.device.write.bytes.rate_server_pd_22:
+      - abstract_pd_server_2
+      - disk.device.write.bytes.rate_pd_server
+      disk.device.write.bytes.rate_server_pd_21:
+      - abstract_pd_server_3
+      - disk.device.write.bytes.rate_pd_server
+      disk.device.read.requests_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes_server_pd_2
-      disk.capacity_server_pd_1_test_nested3Level:
+      - disk.device.read.requests_server_pd_32
+      disk.iops_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_pd_1
-      feature_pd01_port_0:
-      - abstract_pd_server_3
-      - feature_pd_server_pd01_port
-      disk.device.latency_server_pd_2:
+      - disk.iops_server_pd_31
+      scalable_server_pd_22:
       - abstract_pd_server_2
-      - disk.device.latency_pd_server
-      disk.device.latency_server_pd_1:
+      - scalable_pd_server
+      scalable_server_pd_21:
       - abstract_pd_server_3
-      - disk.device.latency_pd_server
-      memory.resident_server_pd_2_test_nested3Level:
+      - scalable_pd_server
+      disk.write.requests_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_pd_2
-      disk.device.read.requests.rate_server_pd_2_test_nested3Level:
+      - disk.write.requests_server_pd_31
+      instance_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_pd_2
-      network.outgoing.bytes_pd02_port_0_test_nested3Level:
+      - instance_server_pd_31
+      disk.write.bytes_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_pd02_port_0
-      disk.write.bytes_server_pd_1_test_nested3Level:
+      - disk.write.bytes_server_pd_31
+      disk.root.size_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_pd_1
-      endpoint_server_pd_1_test_nested3Level:
+      - disk.root.size_server_pd_32
+      vcpus_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_pd_1
-      network.outgoing.bytes.rate_pd01_port_0:
-      - abstract_pd_server_3
-      - network.outgoing.bytes.rate_pd_server_pd01_port
-      disk.allocation_server_pd_2_test_nested3Level:
+      - vcpus_server_pd_32
+      disk.latency_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_pd_2
-      network.outpoing.packets_pd02_port_0_test_nested3Level:
+      - disk.latency_server_pd_32
+      network.incoming.packets.rate_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_pd02_port_0
-      binding_pd02_port_0:
-      - abstract_pd_server_2
-      - binding_pd_server_pd02_port
-      disk.device.read.bytes_server_pd_2_test_nested3Level:
+      - network.incoming.packets.rate_pd02_port_03
+      disk.root.size_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_pd_2
-      feature_test_nested3Level:
+      - disk.root.size_server_pd_31
+      memory_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - feature
-      disk.write.requests.rate_server_pd_1_test_nested3Level:
+      - memory_server_pd_31
+      os_server_pd_22:
+      - abstract_pd_server_2
+      - os_pd_server
+      disk.ephemeral.size_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_pd_1
-      disk.latency_server_pd_1_test_nested3Level:
+      - disk.ephemeral.size_server_pd_31
+      os_server_pd_21:
+      - abstract_pd_server_3
+      - os_pd_server
+      cpu_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_pd_1
-      network.incoming.bytes_pd01_port_0:
+      - cpu_server_pd_32
+      network.incoming.bytes_pd01_port_02:
       - abstract_pd_server_3
       - network.incoming.bytes_pd_server_pd01_port
-      cpu_util_server_pd_2_test_nested3Level:
+      cpu_util_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - cpu_util_server_pd_2
-      network.outgoing.packets.rate_pd02_port_0:
-      - abstract_pd_server_2
-      - network.outgoing.packets.rate_pd_server_pd02_port
-      network.outpoing.packets_pd02_port_0:
+      - cpu_util_server_pd_32
+      host_server_pd_22:
       - abstract_pd_server_2
-      - network.outpoing.packets_pd_server_pd02_port
-      disk.iops_server_pd_2_test_nested3Level:
+      - host_pd_server
+      host_server_pd_21:
+      - abstract_pd_server_3
+      - host_pd_server
+      cpu_util_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_pd_2
-      network.incoming.packets_pd01_port_0:
+      - cpu_util_server_pd_31
+      disk.capacity_server_pd_22:
+      - abstract_pd_server_2
+      - disk.capacity_pd_server
+      disk.capacity_server_pd_21:
       - abstract_pd_server_3
-      - network.incoming.packets_pd_server_pd01_port
-      attachment_pd02_port_0_test_nested3Level:
+      - disk.capacity_pd_server
+      network.outgoing.packets.rate_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - attachment_pd02_port_0
-      disk.device.read.bytes.rate_server_pd_2_test_nested3Level:
+      - network.outgoing.packets.rate_pd02_port_03
+      network.outpoing.packets_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_pd_2
-      disk.device.allocation_server_pd_1:
-      - abstract_pd_server_3
-      - disk.device.allocation_pd_server
-      binding_server_pd_2_test_nested3Level:
+      - network.outpoing.packets_pd01_port_03
+      network.outgoing.bytes_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - binding_server_pd_2
-      disk.device.read.requests_server_pd_2_test_nested3Level:
+      - network.outgoing.bytes_pd01_port_03
+      feature_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_pd_2
-      disk.device.allocation_server_pd_2:
-      - abstract_pd_server_2
-      - disk.device.allocation_pd_server
-      memory.usage_server_pd_2:
+      - feature_server_pd_32
+      disk.device.read.requests_server_pd_31_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_pd_31
+      disk.capacity_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_pd_32
+      disk.device.iops_server_pd_31_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_pd_31
+      disk.device.read.bytes.rate_server_pd_22:
       - abstract_pd_server_2
-      - memory.usage_pd_server
-      network.outgoing.packets.rate_pd01_port_0_test_nested3Level:
+      - disk.device.read.bytes.rate_pd_server
+      disk.device.write.bytes.rate_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_pd01_port_0
-      memory.usage_server_pd_1:
+      - disk.device.write.bytes.rate_server_pd_32
+      disk.device.read.bytes.rate_server_pd_21:
       - abstract_pd_server_3
-      - memory.usage_pd_server
-      network.incoming.bytes.rate_pd02_port_0:
-      - abstract_pd_server_2
-      - network.incoming.bytes.rate_pd_server_pd02_port
-      os_server_pd_2:
+      - disk.device.read.bytes.rate_pd_server
+      feature_test_nested3Level:
+      - test_nested3Level
+      - feature
+      disk.usage_server_pd_22:
       - abstract_pd_server_2
-      - os_pd_server
-      memory.usage_server_pd_1_test_nested3Level:
+      - disk.usage_pd_server
+      binding_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_pd_1
-      disk.latency_server_pd_1:
+      - binding_pd01_port_03
+      disk.usage_server_pd_21:
       - abstract_pd_server_3
-      - disk.latency_pd_server
-      disk.latency_server_pd_2:
+      - disk.usage_pd_server
+      vcpus_server_pd_21:
+      - abstract_pd_server_3
+      - vcpus_pd_server
+      vcpus_server_pd_22:
       - abstract_pd_server_2
-      - disk.latency_pd_server
-      scalable_server_pd_2:
+      - vcpus_pd_server
+      disk.usage_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_pd_32
+      instance_server_pd_22:
       - abstract_pd_server_2
-      - scalable_pd_server
-      scalable_server_pd_1:
+      - instance_pd_server
+      instance_server_pd_21:
       - abstract_pd_server_3
-      - scalable_pd_server
-      disk.root.size_server_pd_1_test_nested3Level:
+      - instance_pd_server
+      binding_pd02_port_03_test_nested3Level:
+      - test_nested3Level
+      - binding_pd02_port_03
+      binding_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_pd_1
-      os_server_pd_1:
+      - binding_server_pd_31
+      disk.device.write.bytes_server_pd_22:
+      - abstract_pd_server_2
+      - disk.device.write.bytes_pd_server
+      disk.device.write.bytes_server_pd_21:
       - abstract_pd_server_3
-      - os_pd_server
-    requirements:
-      link_pd01_port_0:
+      - disk.device.write.bytes_pd_server
+      cpu_server_pd_21:
       - abstract_pd_server_3
-      - link_pd_server_pd01_port
-      link_pd02_port_0:
+      - cpu_pd_server
+      network.incoming.bytes.rate_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_pd01_port_03
+      cpu_server_pd_22:
       - abstract_pd_server_2
-      - link_pd_server_pd02_port
-      link_pd02_port_0_test_nested3Level:
+      - cpu_pd_server
+      disk.device.write.bytes_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_pd_32
+      network.outgoing.bytes.rate_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_pd01_port_03
+      network.incoming.bytes.rate_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - link_pd02_port_0
-      local_storage_server_pd_2_test_nested3Level:
+      - network.incoming.bytes.rate_pd02_port_03
+      network.outgoing.bytes.rate_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_pd_2
-      local_storage_server_pd_1:
+      - network.outgoing.bytes.rate_pd02_port_03
+      network.outgoing.bytes.rate_pd02_port_02:
+      - abstract_pd_server_2
+      - network.outgoing.bytes.rate_pd_server_pd02_port
+      disk.device.allocation_server_pd_31_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_pd_31
+      network.incoming.packets.rate_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_pd01_port_03
+    requirements:
+      local_storage_server_pd_22:
+      - abstract_pd_server_2
+      - local_storage_pd_server
+      local_storage_server_pd_21:
       - abstract_pd_server_3
       - local_storage_pd_server
-      local_storage_server_pd_2:
+      link_pd01_port_03_test_nested3Level:
+      - test_nested3Level
+      - link_pd01_port_03
+      link_pd02_port_02:
       - abstract_pd_server_2
-      - local_storage_pd_server
-      dependency_pd01_port_0_test_nested3Level:
+      - link_pd_server_pd02_port
+      dependency_pd02_port_03_test_nested3Level:
       - test_nested3Level
-      - dependency_pd01_port_0
-      dependency_pd01_port_0:
-      - abstract_pd_server_3
-      - dependency_pd_server_pd01_port
-      dependency_server_pd_1:
-      - abstract_pd_server_3
-      - dependency_pd_server
-      dependency_server_pd_1_test_nested3Level:
+      - dependency_pd02_port_03
+      dependency_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - dependency_server_pd_1
-      dependency_server_pd_2:
+      - dependency_server_pd_31
+      link_pd01_port_02:
+      - abstract_pd_server_3
+      - link_pd_server_pd01_port
+      dependency_server_pd_22:
       - abstract_pd_server_2
       - dependency_pd_server
-      dependency_pd02_port_0:
+      local_storage_server_pd_32_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_pd_32
+      link_pd02_port_03_test_nested3Level:
+      - test_nested3Level
+      - link_pd02_port_03
+      dependency_pd02_port_02:
       - abstract_pd_server_2
       - dependency_pd_server_pd02_port
-      dependency_server_pd_2_test_nested3Level:
+      dependency_server_pd_21:
+      - abstract_pd_server_3
+      - dependency_pd_server
+      dependency_pd01_port_03_test_nested3Level:
       - test_nested3Level
-      - dependency_server_pd_2
-      dependency_pd02_port_0_test_nested3Level:
+      - dependency_pd01_port_03
+      local_storage_server_pd_31_test_nested3Level:
       - test_nested3Level
-      - dependency_pd02_port_0
-      local_storage_server_pd_1_test_nested3Level:
+      - local_storage_server_pd_31
+      dependency_server_pd_32_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_pd_1
+      - dependency_server_pd_32
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
-      link_pd01_port_0_test_nested3Level:
-      - test_nested3Level
-      - link_pd01_port_0
+      dependency_pd01_port_02:
+      - abstract_pd_server_3
+      - dependency_pd_server_pd01_port
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
index 7cf3a5a..4d9ad8d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml
@@ -67,23 +67,23 @@ topology_template:
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 1
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
+          - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd02_port_network_role_tag: oam
+        port_pd01_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd02_port_ip_requirements:
+        port_pd01_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd02_port_network:
+        port_pd01_port_network:
         - get_input: oam_net_name
+        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -104,23 +104,23 @@ topology_template:
         compute_pd_server_name:
         - get_input:
           - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
+          - 1
+        port_pd02_port_mac_requirements:
           mac_count_required:
             is_required: false
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd02_port_network_role_tag: oam
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_ip_requirements:
+        port_pd02_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_network:
+        port_pd02_port_network:
         - get_input: oam_net_name
-        port_pd01_port_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -143,340 +143,340 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      disk.iops_server_pd_1:
+      attachment_pd02_port_03:
+      - abstract_pd_server_1
+      - attachment_pd_server_pd02_port
+      disk.root.size_server_pd_31:
+      - abstract_pd_server
+      - disk.root.size_pd_server
+      disk.root.size_server_pd_32:
+      - abstract_pd_server_1
+      - disk.root.size_pd_server
+      network.outgoing.packets.rate_pd02_port_03:
+      - abstract_pd_server_1
+      - network.outgoing.packets.rate_pd_server_pd02_port
+      disk.iops_server_pd_32:
       - abstract_pd_server_1
       - disk.iops_pd_server
-      disk.iops_server_pd_2:
+      disk.iops_server_pd_31:
       - abstract_pd_server
       - disk.iops_pd_server
-      disk.write.bytes.rate_server_pd_2:
+      network.outpoing.packets_pd01_port_03:
       - abstract_pd_server
-      - disk.write.bytes.rate_pd_server
-      disk.write.bytes.rate_server_pd_1:
+      - network.outpoing.packets_pd_server_pd01_port
+      disk.device.write.bytes.rate_server_pd_32:
       - abstract_pd_server_1
-      - disk.write.bytes.rate_pd_server
-      cpu.delta_server_pd_2:
+      - disk.device.write.bytes.rate_pd_server
+      disk.device.write.bytes.rate_server_pd_31:
       - abstract_pd_server
-      - cpu.delta_pd_server
-      feature_server_pd_2:
+      - disk.device.write.bytes.rate_pd_server
+      network.outgoing.bytes_pd01_port_03:
       - abstract_pd_server
-      - feature_pd_server
-      feature_server_pd_1:
-      - abstract_pd_server_1
-      - feature_pd_server
-      cpu.delta_server_pd_1:
-      - abstract_pd_server_1
-      - cpu.delta_pd_server
-      host_server_pd_1:
+      - network.outgoing.bytes_pd_server_pd01_port
+      disk.write.requests_server_pd_32:
       - abstract_pd_server_1
-      - host_pd_server
-      network.outgoing.bytes_pd02_port_0:
-      - abstract_pd_server
-      - network.outgoing.bytes_pd_server_pd02_port
-      host_server_pd_2:
+      - disk.write.requests_pd_server
+      disk.write.requests_server_pd_31:
       - abstract_pd_server
-      - host_pd_server
-      network.outgoing.bytes_pd01_port_0:
+      - disk.write.requests_pd_server
+      disk.read.bytes_server_pd_32:
       - abstract_pd_server_1
-      - network.outgoing.bytes_pd_server_pd01_port
-      memory_server_pd_2:
+      - disk.read.bytes_pd_server
+      disk.read.bytes_server_pd_31:
       - abstract_pd_server
-      - memory_pd_server
-      memory_server_pd_1:
+      - disk.read.bytes_pd_server
+      network.incoming.packets.rate_pd02_port_03:
       - abstract_pd_server_1
-      - memory_pd_server
-      network.incoming.packets_pd02_port_0:
+      - network.incoming.packets.rate_pd_server_pd02_port
+      cpu_util_server_pd_31:
       - abstract_pd_server
-      - network.incoming.packets_pd_server_pd02_port
-      memory.resident_server_pd_1:
+      - cpu_util_pd_server
+      cpu_util_server_pd_32:
       - abstract_pd_server_1
-      - memory.resident_pd_server
-      memory.resident_server_pd_2:
-      - abstract_pd_server
-      - memory.resident_pd_server
-      network.incoming.bytes_pd02_port_0:
+      - cpu_util_pd_server
+      disk.allocation_server_pd_31:
       - abstract_pd_server
-      - network.incoming.bytes_pd_server_pd02_port
-      disk.write.requests_server_pd_1:
+      - disk.allocation_pd_server
+      disk.allocation_server_pd_32:
       - abstract_pd_server_1
-      - disk.write.requests_pd_server
-      disk.ephemeral.size_server_pd_2:
-      - abstract_pd_server
-      - disk.ephemeral.size_pd_server
-      disk.ephemeral.size_server_pd_1:
+      - disk.allocation_pd_server
+      disk.device.write.bytes_server_pd_32:
       - abstract_pd_server_1
-      - disk.ephemeral.size_pd_server
-      disk.write.requests_server_pd_2:
-      - abstract_pd_server
-      - disk.write.requests_pd_server
-      disk.write.bytes_server_pd_1:
+      - disk.device.write.bytes_pd_server
+      feature_pd02_port_03:
       - abstract_pd_server_1
-      - disk.write.bytes_pd_server
-      disk.write.bytes_server_pd_2:
+      - feature_pd_server_pd02_port
+      disk.device.write.bytes_server_pd_31:
       - abstract_pd_server
-      - disk.write.bytes_pd_server
-      disk.read.requests_server_pd_1:
+      - disk.device.write.bytes_pd_server
+      memory.usage_server_pd_32:
       - abstract_pd_server_1
-      - disk.read.requests_pd_server
-      network.outgoing.bytes.rate_pd02_port_0:
+      - memory.usage_pd_server
+      memory.usage_server_pd_31:
       - abstract_pd_server
-      - network.outgoing.bytes.rate_pd_server_pd02_port
-      binding_pd01_port_0:
+      - memory.usage_pd_server
+      disk.read.bytes.rate_server_pd_31:
+      - abstract_pd_server
+      - disk.read.bytes.rate_pd_server
+      disk.read.bytes.rate_server_pd_32:
       - abstract_pd_server_1
-      - binding_pd_server_pd01_port
-      disk.read.requests_server_pd_2:
+      - disk.read.bytes.rate_pd_server
+      binding_pd01_port_03:
       - abstract_pd_server
-      - disk.read.requests_pd_server
-      disk.device.usage_server_pd_2:
+      - binding_pd_server_pd01_port
+      attachment_pd01_port_03:
       - abstract_pd_server
-      - disk.device.usage_pd_server
-      disk.device.usage_server_pd_1:
-      - abstract_pd_server_1
-      - disk.device.usage_pd_server
-      disk.device.read.bytes_server_pd_1:
+      - attachment_pd_server_pd01_port
+      disk.device.read.bytes_server_pd_32:
       - abstract_pd_server_1
       - disk.device.read.bytes_pd_server
-      disk.device.read.bytes_server_pd_2:
+      disk.device.read.bytes_server_pd_31:
       - abstract_pd_server
       - disk.device.read.bytes_pd_server
-      network.incoming.packets.rate_pd02_port_0:
+      cpu.delta_server_pd_31:
       - abstract_pd_server
-      - network.incoming.packets.rate_pd_server_pd02_port
-      network.outgoing.packets.rate_pd01_port_0:
-      - abstract_pd_server_1
-      - network.outgoing.packets.rate_pd_server_pd01_port
-      disk.write.requests.rate_server_pd_1:
-      - abstract_pd_server_1
-      - disk.write.requests.rate_pd_server
-      disk.write.requests.rate_server_pd_2:
-      - abstract_pd_server
-      - disk.write.requests.rate_pd_server
-      disk.root.size_server_pd_1:
-      - abstract_pd_server_1
-      - disk.root.size_pd_server
-      disk.device.iops_server_pd_1:
+      - cpu.delta_pd_server
+      disk.device.iops_server_pd_32:
       - abstract_pd_server_1
       - disk.device.iops_pd_server
-      disk.device.iops_server_pd_2:
+      disk.device.iops_server_pd_31:
       - abstract_pd_server
       - disk.device.iops_pd_server
-      feature_pd02_port_0:
+      cpu.delta_server_pd_32:
+      - abstract_pd_server_1
+      - cpu.delta_pd_server
+      disk.ephemeral.size_server_pd_32:
+      - abstract_pd_server_1
+      - disk.ephemeral.size_pd_server
+      disk.read.requests_server_pd_32:
+      - abstract_pd_server_1
+      - disk.read.requests_pd_server
+      scalable_server_pd_31:
       - abstract_pd_server
-      - feature_pd_server_pd02_port
-      disk.root.size_server_pd_2:
+      - scalable_pd_server
+      disk.ephemeral.size_server_pd_31:
       - abstract_pd_server
-      - disk.root.size_pd_server
-      disk.usage_server_pd_2:
+      - disk.ephemeral.size_pd_server
+      disk.read.requests_server_pd_31:
       - abstract_pd_server
-      - disk.usage_pd_server
-      disk.usage_server_pd_1:
+      - disk.read.requests_pd_server
+      network.outgoing.bytes_pd02_port_03:
       - abstract_pd_server_1
-      - disk.usage_pd_server
-      disk.read.bytes.rate_server_pd_2:
-      - abstract_pd_server
-      - disk.read.bytes.rate_pd_server
-      disk.read.bytes.rate_server_pd_1:
+      - network.outgoing.bytes_pd_server_pd02_port
+      network.outpoing.packets_pd02_port_03:
       - abstract_pd_server_1
-      - disk.read.bytes.rate_pd_server
-      cpu_server_pd_2:
+      - network.outpoing.packets_pd_server_pd02_port
+      disk.device.write.requests.rate_server_pd_31:
       - abstract_pd_server
-      - cpu_pd_server
-      cpu_server_pd_1:
+      - disk.device.write.requests.rate_pd_server
+      disk.device.write.requests.rate_server_pd_32:
       - abstract_pd_server_1
-      - cpu_pd_server
-      attachment_pd01_port_0:
+      - disk.device.write.requests.rate_pd_server
+      network.incoming.bytes.rate_pd02_port_03:
       - abstract_pd_server_1
-      - attachment_pd_server_pd01_port
-      endpoint_server_pd_2:
-      - abstract_pd_server
-      - endpoint_pd_server
-      endpoint_server_pd_1:
+      - network.incoming.bytes.rate_pd_server_pd02_port
+      scalable_server_pd_32:
       - abstract_pd_server_1
-      - endpoint_pd_server
-      vcpus_server_pd_1:
+      - scalable_pd_server
+      disk.device.latency_server_pd_32:
       - abstract_pd_server_1
-      - vcpus_pd_server
-      vcpus_server_pd_2:
+      - disk.device.latency_pd_server
+      disk.device.write.requests_server_pd_32:
+      - abstract_pd_server_1
+      - disk.device.write.requests_pd_server
+      network.incoming.packets.rate_pd01_port_03:
       - abstract_pd_server
-      - vcpus_pd_server
-      disk.device.capacity_server_pd_2:
+      - network.incoming.packets.rate_pd_server_pd01_port
+      disk.device.write.requests_server_pd_31:
       - abstract_pd_server
-      - disk.device.capacity_pd_server
-      disk.device.capacity_server_pd_1:
+      - disk.device.write.requests_pd_server
+      disk.device.latency_server_pd_31:
+      - abstract_pd_server
+      - disk.device.latency_pd_server
+      network.incoming.packets_pd01_port_03:
+      - abstract_pd_server
+      - network.incoming.packets_pd_server_pd01_port
+      disk.device.usage_server_pd_31:
+      - abstract_pd_server
+      - disk.device.usage_pd_server
+      disk.device.usage_server_pd_32:
       - abstract_pd_server_1
-      - disk.device.capacity_pd_server
-      disk.device.write.bytes.rate_server_pd_1:
+      - disk.device.usage_pd_server
+      feature_pd01_port_03:
+      - abstract_pd_server
+      - feature_pd_server_pd01_port
+      disk.device.read.requests_server_pd_32:
       - abstract_pd_server_1
-      - disk.device.write.bytes.rate_pd_server
-      disk.device.write.bytes.rate_server_pd_2:
+      - disk.device.read.requests_pd_server
+      os_server_pd_31:
       - abstract_pd_server
-      - disk.device.write.bytes.rate_pd_server
-      network.incoming.bytes.rate_pd01_port_0:
+      - os_pd_server
+      os_server_pd_32:
       - abstract_pd_server_1
+      - os_pd_server
+      disk.device.read.requests_server_pd_31:
+      - abstract_pd_server
+      - disk.device.read.requests_pd_server
+      network.incoming.bytes.rate_pd01_port_03:
+      - abstract_pd_server
       - network.incoming.bytes.rate_pd_server_pd01_port
-      feature_pd01_port_0:
+      binding_pd02_port_03:
       - abstract_pd_server_1
-      - feature_pd_server_pd01_port
-      disk.device.latency_server_pd_2:
+      - binding_pd_server_pd02_port
+      disk.capacity_server_pd_32:
+      - abstract_pd_server_1
+      - disk.capacity_pd_server
+      disk.capacity_server_pd_31:
       - abstract_pd_server
-      - disk.device.latency_pd_server
-      disk.device.latency_server_pd_1:
+      - disk.capacity_pd_server
+      network.incoming.bytes_pd01_port_03:
+      - abstract_pd_server
+      - network.incoming.bytes_pd_server_pd01_port
+      vcpus_server_pd_31:
+      - abstract_pd_server
+      - vcpus_pd_server
+      network.incoming.packets_pd02_port_03:
       - abstract_pd_server_1
-      - disk.device.latency_pd_server
-      instance_server_pd_1:
+      - network.incoming.packets_pd_server_pd02_port
+      disk.usage_server_pd_32:
       - abstract_pd_server_1
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_1:
+      - disk.usage_pd_server
+      vcpus_server_pd_32:
       - abstract_pd_server_1
-      - disk.device.read.requests.rate_pd_server
-      instance_server_pd_2:
+      - vcpus_pd_server
+      memory.resident_server_pd_32:
+      - abstract_pd_server_1
+      - memory.resident_pd_server
+      disk.usage_server_pd_31:
       - abstract_pd_server
-      - instance_pd_server
-      disk.device.read.requests.rate_server_pd_2:
+      - disk.usage_pd_server
+      memory.resident_server_pd_31:
       - abstract_pd_server
-      - disk.device.read.requests.rate_pd_server
-      attachment_pd02_port_0:
+      - memory.resident_pd_server
+      network.outgoing.bytes.rate_pd01_port_03:
       - abstract_pd_server
-      - attachment_pd_server_pd02_port
-      network.outgoing.bytes.rate_pd01_port_0:
-      - abstract_pd_server_1
       - network.outgoing.bytes.rate_pd_server_pd01_port
-      cpu_util_server_pd_1:
+      cpu_server_pd_32:
       - abstract_pd_server_1
-      - cpu_util_pd_server
-      cpu_util_server_pd_2:
+      - cpu_pd_server
+      cpu_server_pd_31:
       - abstract_pd_server
-      - cpu_util_pd_server
-      disk.device.read.bytes.rate_server_pd_2:
+      - cpu_pd_server
+      feature_server_pd_31:
       - abstract_pd_server
-      - disk.device.read.bytes.rate_pd_server
-      binding_pd02_port_0:
+      - feature_pd_server
+      feature_server_pd_32:
+      - abstract_pd_server_1
+      - feature_pd_server
+      endpoint_server_pd_32:
+      - abstract_pd_server_1
+      - endpoint_pd_server
+      endpoint_server_pd_31:
       - abstract_pd_server
-      - binding_pd_server_pd02_port
-      disk.allocation_server_pd_2:
+      - endpoint_pd_server
+      disk.device.capacity_server_pd_31:
       - abstract_pd_server
-      - disk.allocation_pd_server
-      disk.device.write.bytes_server_pd_1:
-      - abstract_pd_server_1
-      - disk.device.write.bytes_pd_server
-      disk.device.write.bytes_server_pd_2:
+      - disk.device.capacity_pd_server
+      host_server_pd_31:
       - abstract_pd_server
-      - disk.device.write.bytes_pd_server
-      disk.allocation_server_pd_1:
+      - host_pd_server
+      host_server_pd_32:
       - abstract_pd_server_1
-      - disk.allocation_pd_server
-      network.incoming.packets.rate_pd01_port_0:
+      - host_pd_server
+      disk.device.capacity_server_pd_32:
       - abstract_pd_server_1
-      - network.incoming.packets.rate_pd_server_pd01_port
-      disk.capacity_server_pd_2:
+      - disk.device.capacity_pd_server
+      disk.latency_server_pd_32:
+      - abstract_pd_server_1
+      - disk.latency_pd_server
+      disk.write.requests.rate_server_pd_31:
       - abstract_pd_server
-      - disk.capacity_pd_server
-      disk.capacity_server_pd_1:
+      - disk.write.requests.rate_pd_server
+      disk.write.requests.rate_server_pd_32:
       - abstract_pd_server_1
-      - disk.capacity_pd_server
-      disk.device.read.bytes.rate_server_pd_1:
+      - disk.write.requests.rate_pd_server
+      network.outgoing.packets.rate_pd01_port_03:
+      - abstract_pd_server
+      - network.outgoing.packets.rate_pd_server_pd01_port
+      memory_server_pd_32:
       - abstract_pd_server_1
-      - disk.device.read.bytes.rate_pd_server
-      network.incoming.bytes_pd01_port_0:
+      - memory_pd_server
+      network.incoming.bytes_pd02_port_03:
       - abstract_pd_server_1
-      - network.incoming.bytes_pd_server_pd01_port
-      network.outgoing.packets.rate_pd02_port_0:
+      - network.incoming.bytes_pd_server_pd02_port
+      memory_server_pd_31:
       - abstract_pd_server
-      - network.outgoing.packets.rate_pd_server_pd02_port
-      network.outpoing.packets_pd02_port_0:
+      - memory_pd_server
+      disk.device.read.bytes.rate_server_pd_31:
       - abstract_pd_server
-      - network.outpoing.packets_pd_server_pd02_port
-      network.outpoing.packets_pd01_port_0:
+      - disk.device.read.bytes.rate_pd_server
+      disk.device.read.bytes.rate_server_pd_32:
       - abstract_pd_server_1
-      - network.outpoing.packets_pd_server_pd01_port
-      binding_server_pd_2:
-      - abstract_pd_server
-      - binding_pd_server
-      disk.device.write.requests_server_pd_2:
+      - disk.device.read.bytes.rate_pd_server
+      disk.latency_server_pd_31:
       - abstract_pd_server
-      - disk.device.write.requests_pd_server
-      binding_server_pd_1:
-      - abstract_pd_server_1
-      - binding_pd_server
-      disk.device.write.requests_server_pd_1:
-      - abstract_pd_server_1
-      - disk.device.write.requests_pd_server
-      network.incoming.packets_pd01_port_0:
-      - abstract_pd_server_1
-      - network.incoming.packets_pd_server_pd01_port
-      disk.device.allocation_server_pd_1:
+      - disk.latency_pd_server
+      disk.device.allocation_server_pd_32:
       - abstract_pd_server_1
       - disk.device.allocation_pd_server
-      disk.device.allocation_server_pd_2:
+      disk.device.read.requests.rate_server_pd_31:
+      - abstract_pd_server
+      - disk.device.read.requests.rate_pd_server
+      instance_server_pd_32:
+      - abstract_pd_server_1
+      - instance_pd_server
+      disk.device.allocation_server_pd_31:
       - abstract_pd_server
       - disk.device.allocation_pd_server
-      disk.device.write.requests.rate_server_pd_2:
+      disk.write.bytes_server_pd_31:
       - abstract_pd_server
-      - disk.device.write.requests.rate_pd_server
-      memory.usage_server_pd_2:
+      - disk.write.bytes_pd_server
+      binding_server_pd_31:
       - abstract_pd_server
-      - memory.usage_pd_server
-      disk.read.bytes_server_pd_1:
+      - binding_pd_server
+      disk.device.read.requests.rate_server_pd_32:
       - abstract_pd_server_1
-      - disk.read.bytes_pd_server
-      disk.device.read.requests_server_pd_1:
+      - disk.device.read.requests.rate_pd_server
+      disk.write.bytes_server_pd_32:
       - abstract_pd_server_1
-      - disk.device.read.requests_pd_server
-      disk.device.read.requests_server_pd_2:
-      - abstract_pd_server
-      - disk.device.read.requests_pd_server
-      disk.read.bytes_server_pd_2:
-      - abstract_pd_server
-      - disk.read.bytes_pd_server
-      memory.usage_server_pd_1:
+      - disk.write.bytes_pd_server
+      binding_server_pd_32:
       - abstract_pd_server_1
-      - memory.usage_pd_server
-      network.incoming.bytes.rate_pd02_port_0:
-      - abstract_pd_server
-      - network.incoming.bytes.rate_pd_server_pd02_port
-      disk.device.write.requests.rate_server_pd_1:
+      - binding_pd_server
+      network.outgoing.bytes.rate_pd02_port_03:
       - abstract_pd_server_1
-      - disk.device.write.requests.rate_pd_server
-      os_server_pd_2:
-      - abstract_pd_server
-      - os_pd_server
-      disk.latency_server_pd_1:
+      - network.outgoing.bytes.rate_pd_server_pd02_port
+      disk.write.bytes.rate_server_pd_32:
       - abstract_pd_server_1
-      - disk.latency_pd_server
-      disk.latency_server_pd_2:
+      - disk.write.bytes.rate_pd_server
+      instance_server_pd_31:
       - abstract_pd_server
-      - disk.latency_pd_server
-      scalable_server_pd_2:
+      - instance_pd_server
+      disk.write.bytes.rate_server_pd_31:
       - abstract_pd_server
-      - scalable_pd_server
-      scalable_server_pd_1:
-      - abstract_pd_server_1
-      - scalable_pd_server
-      os_server_pd_1:
-      - abstract_pd_server_1
-      - os_pd_server
+      - disk.write.bytes.rate_pd_server
     requirements:
-      link_pd01_port_0:
+      dependency_server_pd_32:
       - abstract_pd_server_1
-      - link_pd_server_pd01_port
-      link_pd02_port_0:
-      - abstract_pd_server
-      - link_pd_server_pd02_port
-      local_storage_server_pd_1:
+      - dependency_pd_server
+      local_storage_server_pd_32:
       - abstract_pd_server_1
       - local_storage_pd_server
-      local_storage_server_pd_2:
+      dependency_server_pd_31:
+      - abstract_pd_server
+      - dependency_pd_server
+      local_storage_server_pd_31:
       - abstract_pd_server
       - local_storage_pd_server
-      dependency_pd01_port_0:
+      link_pd02_port_03:
       - abstract_pd_server_1
-      - dependency_pd_server_pd01_port
-      dependency_server_pd_1:
+      - link_pd_server_pd02_port
+      dependency_pd02_port_03:
       - abstract_pd_server_1
-      - dependency_pd_server
-      dependency_server_pd_2:
+      - dependency_pd_server_pd02_port
+      link_pd01_port_03:
       - abstract_pd_server
-      - dependency_pd_server
-      dependency_pd02_port_0:
+      - link_pd_server_pd01_port
+      dependency_pd01_port_03:
       - abstract_pd_server
-      - dependency_pd_server_pd02_port
+      - dependency_pd_server_pd01_port
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-no-compute.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-no-compute.yml
index 5e0627f..9e49695 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-no-compute.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-no-compute.yml
@@ -35,14 +35,14 @@ parameters:
     type: string
 
 resources:
-  cmaui_port_1:
+  cmaui_port_11:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_internal_network}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_12:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: packet_external_network}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml
index 5907ec3..65ef047 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml
@@ -36,9 +36,9 @@ parameters:
     description: Flavor for CMAUI server
   cmaui_oam_ips:
       type: string
-  packet_internal_network_name:
+  packet_internal_network_1_name:
       type: string
-  packet_external_network_name:
+  packet_external_network_1_name:
       type: string
   net:
     type: string
@@ -66,14 +66,14 @@ parameters:
       type: string
       
 resources:
-  pd_server_1b_port:
+  pd_server_1b_port_1:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
       fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}]
       replacement_policy: AUTO
 
-  ps_server_1b_port:
+  ps_server_1b_port_1:
     type: OS::Neutron::Port
     properties:
       network: { get_param: net }
@@ -88,7 +88,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-      - port: { get_resource: pd_server_1b_port }
+      - port: { get_resource: pd_server_1b_port_1 }
 
   server_1b_pd_2:
     type: OS::Nova::Server
@@ -98,19 +98,19 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: pd_server_1b_flavor }
       networks:
-      - port: { get_resource: ps_server_1b_port }
+      - port: { get_resource: ps_server_1b_port_1 }
       
   cmaui_port_1:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_external_network_1}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
   cmaui_port_2:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_external_network_1}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
@@ -137,14 +137,14 @@ resources:
   oam_port_1:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_internal_network_1}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}]
       replacement_policy: AUTO
 
   oam_port_2:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_external_network}
+      network: {get_resource: packet_external_network_1}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}]
       replacement_policy: AUTO
 
@@ -179,17 +179,17 @@ resources:
     properties:
       p2: {get_param: p2}
 
-  packet_internal_network:
+  packet_internal_network_1:
     type: OS::Neutron::Net
     properties:
       name:
-        get_param: packet_internal_network_name
+        get_param: packet_internal_network_1_name
 
-  packet_external_network:
+  packet_external_network_1:
     type: OS::Neutron::Net
     properties:
       name:
-        get_param: packet_external_network_name
+        get_param: packet_external_network_1_name
 
 outputs:
   all_pattern_attr_1:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml
index 3a5d110..33a64f5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml
@@ -103,14 +103,14 @@ resources:
   BE_port_1:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_internal_network_2}
       fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}]
       replacement_policy: AUTO
 
   BE_port_2:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_internal_network_2}
       fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}]
       replacement_policy: AUTO
 
@@ -137,14 +137,14 @@ resources:
   osm_port_1:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_internal_network_2}
       fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}]
       replacement_policy: AUTO
 
   osm_port_2:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_external_network}
+      network: {get_resource: packet_external_network_2}
       fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}]
       replacement_policy: AUTO
 
@@ -179,13 +179,13 @@ resources:
     properties:
       p2: {get_param: p2}
 
-  packet_internal_network:
+  packet_internal_network_2:
     type: OS::Neutron::Net
     properties:
       name:
         get_param: packet_internal_network_name
 
-  packet_external_network:
+  packet_external_network_2:
     type: OS::Neutron::Net
     properties:
       name:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ae6c22e..8ad3b6e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -2706,10 +2706,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      packet_internal_network_name:
-        type: string
-        required: true
-        status: SUPPORTED
       pd_server_1b_names:
         type: list
         description: PD server names
@@ -2757,7 +2753,11 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      packet_external_network_name:
+      packet_internal_network_1_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      packet_external_network_1_name:
         type: string
         required: true
         status: SUPPORTED
@@ -2924,19 +2924,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pd_server_1b_port:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pd_server_1b_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_oam_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -2944,61 +2931,67 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_packet_external_network:
+    - dependency_packet_internal_network_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_ps_server_1b_port:
+    - dependency_server_1c1_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_ps_server_1b_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_packet_internal_network:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    - local_storage_server_1c1_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_1c1_cmaui_2:
+    - dependency_server_1c1_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_1c1_cmaui_2:
+    - local_storage_server_1c1_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_1c1_cmaui_1:
+    - dependency_ps_server_1b_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_1c1_cmaui_1:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_ps_server_1b_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_pd_server_1b_port_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - link_pd_server_1b_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_oam_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3006,6 +2999,13 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_packet_external_network_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
     capabilities:
       disk.device.write.bytes.rate_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -3037,6 +3037,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_ps_server_1b_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       disk.iops_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3078,12 +3085,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pd_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_server_1c1_cmaui_2:
         type: tosca.capabilities.Node
         occurrences:
@@ -3095,6 +3096,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3125,6 +3132,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_pd_server_1b_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_oam_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3159,17 +3171,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_ps_server_1b_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests.rate_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3269,6 +3270,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3280,6 +3287,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      link_packet_internal_network_1:
+        type: tosca.capabilities.network.Linkable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_pd_server_port_1_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3382,6 +3394,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_packet_internal_network_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_oam_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3408,6 +3425,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      end_point_packet_internal_network_1:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_server_pd_nested1_pattern_4:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -3425,6 +3447,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_pd_server_port_1_nested1_pattern_4:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -3507,6 +3547,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.resident_server_1b_pd_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3582,12 +3628,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_oam_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3628,6 +3668,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_pd_server_port_2_nested1_pattern_4:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -3718,6 +3764,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       host_server_1b_pd_1:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -3725,12 +3777,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.root.size_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3760,12 +3806,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       host_server_1b_pd_2:
         type: tosca.capabilities.Container
         valid_source_types:
@@ -3773,24 +3813,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pd_server_1b_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       vcpus_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_ps_server_1b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.latency_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3803,11 +3831,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_external_network:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3832,6 +3855,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_ps_server_1b_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_util_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3856,6 +3884,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_pd_server_1b_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       disk.device.latency_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3868,13 +3903,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_pd_server_1b_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.requests.rate_server_1b_pd_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3949,6 +3977,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4053,12 +4087,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4077,11 +4105,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_external_network:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.read.requests_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4130,12 +4153,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_util_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4206,6 +4223,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      end_point_packet_external_network_1:
+        type: tosca.capabilities.Endpoint
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_server_1c1_cmaui_2:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -4222,11 +4244,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_ps_server_1b_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.iops_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4255,24 +4272,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pd_nested1_pattern_4:
+      network.incoming.bytes.rate_ps_server_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes.rate_server_1b_pd_2:
+      disk.device.write.requests.rate_server_pd_nested1_pattern_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_pd_server_1b_port:
+      disk.device.read.bytes.rate_server_1b_pd_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:
@@ -4320,6 +4332,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4464,12 +4482,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4481,12 +4493,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.requests.rate_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4590,11 +4596,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_external_network:
-        type: tosca.capabilities.Endpoint
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4607,12 +4608,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pd_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.requests_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4653,21 +4648,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_1b_port:
+      disk.write.requests_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_1c1_cmaui_2:
+      disk.write.requests_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      link_packet_external_network_1:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4701,6 +4695,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_ps_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_pd_server_port_2_nested1_pattern_4:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4720,11 +4720,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_external_network:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.bytes.rate_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4737,6 +4732,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pd_server_1b_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4749,6 +4749,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_packet_external_network_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu.delta_server_1c2_oam_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4761,6 +4766,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      feature_packet_internal_network_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.iops_server_pd_nested1_pattern_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4797,22 +4807,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_internal_network:
-        type: tosca.capabilities.Endpoint
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes_oam_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_internal_network:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes_oam_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4931,6 +4931,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_server_1b_pd_2:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -4953,13 +4959,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_1c1_cmaui_2:
+      network.incoming.bytes_pd_server_1b_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_ps_server_1b_port:
+      disk.device.read.requests.rate_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4971,11 +4977,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pd_server_1b_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.latency_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5042,13 +5043,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_1c1_cmaui_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_packet_external_network_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pd_server_1b_port:
+      disk.write.bytes_server_1c1_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5082,12 +5082,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pd_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_nested1_pattern_4:
         type: tosca.capabilities.Node
         occurrences:
@@ -5116,11 +5110,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_internal_network:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.latency_server_1c1_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5190,12 +5179,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_ps_server_1b_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5226,6 +5209,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_server_1c2_oam_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5251,11 +5240,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pd_server_1b_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_pd_server_port_2_nested1_pattern_4:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
+      feature_ps_server_1b_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_server_1c2_oam_2:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -6176,83 +6176,83 @@ node_types:
         description: no_compute_attr_1
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_2:
+    - binding_cmaui_port_12:
         capability: tosca.capabilities.network.Bindable
         relationship: tosca.relationships.network.BindsTo
         occurrences:
         - 1
         - 1
-    - dependency_packet_external_network:
+    - dependency_cmaui_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_packet_internal_network:
+    - binding_cmaui_port_11:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_packet_external_network:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_packet_internal_network:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_1:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
     capabilities:
-      network.incoming.packets_cmaui_port_2:
+      network.outgoing.bytes.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      end_point_packet_internal_network:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
+      feature_cmaui_port_12:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_internal_network:
-        type: tosca.capabilities.Endpoint
+      feature_cmaui_port_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -6266,106 +6266,112 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_external_network:
-        type: tosca.capabilities.Endpoint
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes.rate_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      network.incoming.bytes.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      end_point_packet_external_network:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.outgoing.bytes_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      network.outgoing.bytes_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
+      attachment_packet_internal_network:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.packets.rate_cmaui_port_12:
+        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
-      binding_cmaui_port_2:
+      binding_cmaui_port_12:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      network.outgoing.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      attachment_cmaui_port_12:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network:
+      attachment_cmaui_port_11:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      attachment_packet_external_network:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      network.incoming.packets_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_external_network:
-        type: tosca.capabilities.Attachment
+      network.incoming.packets_cmaui_port_12:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      network.incoming.bytes_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6381,12 +6387,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
@@ -7899,4 +7899,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
index 581e296..16ea9d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml
@@ -296,16 +296,6 @@ topology_template:
         port_pd_server_port_1_mac_requirements:
           mac_count_required:
             is_required: false
-    packet_external_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_external_network_name
-    packet_internal_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_internal_network_name
     abstract_osm_server_1c2_0:
       type: org.openecomp.resource.abstract.nodes.osm_server_1c2
       directives:
@@ -314,7 +304,7 @@ topology_template:
         port_osm_port_replacement_policy:
         - AUTO
         port_osm_port_network:
-        - packet_internal_network
+        - packet_internal_network_2
         compute_osm_server_1c2_name:
         - get_input:
           - osm_server_1c2_names
@@ -350,7 +340,7 @@ topology_template:
       requirements:
       - link_osm_server_1c2_osm_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_internal_network_2
           relationship: tosca.relationships.network.LinksTo
     abstract_osm_server_1c2_1:
       type: org.openecomp.resource.abstract.nodes.osm_server_1c2
@@ -360,7 +350,7 @@ topology_template:
         port_osm_port_replacement_policy:
         - AUTO
         port_osm_port_network:
-        - packet_external_network
+        - packet_external_network_2
         compute_osm_server_1c2_name:
         - get_input:
           - osm_server_1c2_names
@@ -413,8 +403,18 @@ topology_template:
       requirements:
       - link_osm_server_1c2_osm_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_external_network
+          node: packet_external_network_2
           relationship: tosca.relationships.network.LinksTo
+    packet_internal_network_2:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_internal_network_name
+    packet_external_network_2:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_external_network_name
     abstract_BE_1c1:
       type: org.openecomp.resource.abstract.nodes.BE_1c1
       directives:
@@ -434,7 +434,7 @@ topology_template:
         - get_input: availability_zone_0
         - get_input: availability_zone_0
         port_BE_port_network:
-        - packet_internal_network
+        - packet_internal_network_2
         port_BE_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -463,7 +463,7 @@ topology_template:
       requirements:
       - link_BE_1c1_BE_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_internal_network_2
           relationship: tosca.relationships.network.LinksTo
     test_nested_all_patterns:
       type: org.openecomp.resource.abstract.nodes.heat.nested1
@@ -499,8 +499,8 @@ topology_template:
         description: nested1
       members:
       - nested2_pattern_4
-      - packet_external_network
-      - packet_internal_network
+      - packet_internal_network_2
+      - packet_external_network_2
       - abstract_rd_server_1b
       - abstract_rd_server_1b_1
       - abstract_osm_server_1c2_0

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
index b3373b5..dc28b6c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -298,4 +298,4 @@ topology_template:
       - dependency
       link_pd_server_1b_ps_server_1b_port:
       - pd_server_1b_ps_server_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index 0d2a6a0..b64b311 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -305,4 +305,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-no-computeServiceTemplate.yaml
index 76061f4..3d08eb0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-no-computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-no-computeServiceTemplate.yaml
@@ -65,7 +65,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_2:
+    cmaui_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -89,17 +89,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: packet_external_network
           relationship: tosca.relationships.network.LinksTo
-    packet_external_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_external_network_name
-    packet_internal_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_internal_network_name
-    cmaui_port_1:
+    cmaui_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -123,6 +113,16 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
+    packet_external_network:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_external_network_name
+    packet_internal_network:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_internal_network_name
   groups:
     nested-no-compute_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -130,10 +130,10 @@ topology_template:
         heat_file: ../Artifacts/nested-no-compute.yml
         description: nested1
       members:
-      - cmaui_port_2
+      - cmaui_port_12
+      - cmaui_port_11
       - packet_external_network
       - packet_internal_network
-      - cmaui_port_1
   outputs:
     no_compute_attr_1:
       description: no_compute_attr_1
@@ -141,86 +141,89 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute
     capabilities:
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
-      - feature
+      network.outgoing.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.outpoing.packets
       end_point_packet_internal_network:
       - packet_internal_network
       - end_point
+      feature_cmaui_port_12:
+      - cmaui_port_12
+      - feature
+      feature_cmaui_port_11:
+      - cmaui_port_11
+      - feature
       link_packet_internal_network:
       - packet_internal_network
       - link
       feature_packet_internal_network:
       - packet_internal_network
       - feature
+      network.incoming.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes.rate
       end_point_packet_external_network:
       - packet_external_network
       - end_point
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.bytes_cmaui_port_11:
+      - cmaui_port_11
       - network.outgoing.bytes
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
+      network.outgoing.bytes_cmaui_port_12:
+      - cmaui_port_12
       - network.outgoing.bytes
-      attachment_cmaui_port_1:
-      - cmaui_port_1
+      attachment_packet_internal_network:
+      - packet_internal_network
       - attachment
-      binding_cmaui_port_1:
-      - cmaui_port_1
+      network.outgoing.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.packets.rate
+      binding_cmaui_port_12:
+      - cmaui_port_12
       - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.packets.rate
+      binding_cmaui_port_11:
+      - cmaui_port_11
       - binding
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      attachment_packet_internal_network:
-      - packet_internal_network
+      attachment_cmaui_port_12:
+      - cmaui_port_12
       - attachment
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
+      attachment_cmaui_port_11:
+      - cmaui_port_11
+      - attachment
+      network.incoming.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets.rate
       attachment_packet_external_network:
       - packet_external_network
       - attachment
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
+      network.incoming.bytes_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_11:
+      - cmaui_port_11
       - network.incoming.bytes
       link_packet_external_network:
       - packet_external_network
@@ -228,25 +231,22 @@ topology_template:
       feature_packet_external_network:
       - packet_external_network
       - feature
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
     requirements:
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
+      dependency_cmaui_port_11:
+      - cmaui_port_11
+      - dependency
+      dependency_cmaui_port_12:
+      - cmaui_port_12
+      - dependency
+      binding_cmaui_port_12:
+      - cmaui_port_12
       - binding
       dependency_packet_internal_network:
       - packet_internal_network
       - dependency
-      dependency_cmaui_port_1:
-      - cmaui_port_1
-      - dependency
-      dependency_cmaui_port_2:
-      - cmaui_port_2
-      - dependency
+      binding_cmaui_port_11:
+      - cmaui_port_11
+      - binding
       dependency_packet_external_network:
       - packet_external_network
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
index 19f9133..b1b6a67 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml
@@ -27,10 +27,6 @@ topology_template:
       hidden: false
       immutable: false
       type: string
-    packet_internal_network_name:
-      hidden: false
-      immutable: false
-      type: string
     pd_server_1b_names:
       hidden: false
       immutable: false
@@ -78,7 +74,11 @@ topology_template:
       hidden: false
       immutable: false
       type: string
-    packet_external_network_name:
+    packet_internal_network_1_name:
+      hidden: false
+      immutable: false
+      type: string
+    packet_external_network_1_name:
       hidden: false
       immutable: false
       type: string
@@ -176,7 +176,7 @@ topology_template:
             - cmaui_oam_ips
             - 0
         port_cmaui_port_network:
-        - packet_internal_network
+        - packet_external_network_1
         compute_cmaui_1c1_availability_zone:
         - get_input: availability_zone_0
         - get_input: availability_zone_0
@@ -213,7 +213,7 @@ topology_template:
       requirements:
       - link_cmaui_1c1_cmaui_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_external_network_1
           relationship: tosca.relationships.network.LinksTo
     nested1_pattern_4:
       type: org.openecomp.resource.abstract.nodes.heat.pd_server
@@ -283,16 +283,11 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    packet_external_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_external_network_name
-    packet_internal_network:
+    packet_internal_network_1:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
         network_name:
-          get_input: packet_internal_network_name
+          get_input: packet_internal_network_1_name
     abstract_oam_server_1c2_1:
       type: org.openecomp.resource.abstract.nodes.oam_server_1c2
       directives:
@@ -306,7 +301,7 @@ topology_template:
           - oam_server_1c2_names
           - 1
         port_oam_port_network:
-        - packet_external_network
+        - packet_external_network_1
         vm_flavor_name:
           get_input: oam_server_1c2_flavor
         compute_oam_server_1c2_availability_zone:
@@ -354,7 +349,7 @@ topology_template:
       requirements:
       - link_oam_server_1c2_oam_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_external_network
+          node: packet_external_network_1
           relationship: tosca.relationships.network.LinksTo
     abstract_oam_server_1c2_0:
       type: org.openecomp.resource.abstract.nodes.oam_server_1c2
@@ -369,7 +364,7 @@ topology_template:
           - oam_server_1c2_names
           - 0
         port_oam_port_network:
-        - packet_internal_network
+        - packet_internal_network_1
         vm_flavor_name:
           get_input: oam_server_1c2_flavor
         compute_oam_server_1c2_availability_zone:
@@ -400,8 +395,13 @@ topology_template:
       requirements:
       - link_oam_server_1c2_oam_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_internal_network_1
           relationship: tosca.relationships.network.LinksTo
+    packet_external_network_1:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_external_network_1_name
   groups:
     nested1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -410,8 +410,8 @@ topology_template:
         description: nested1
       members:
       - nested1_pattern_4
-      - packet_external_network
-      - packet_internal_network
+      - packet_internal_network_1
+      - packet_external_network_1
       - abstract_oam_server_1c2_0
       - abstract_oam_server_1c2_1
       - abstract_pd_server_1b
@@ -442,6 +442,9 @@ topology_template:
       memory_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - memory_server_pd
+      binding_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - binding_pd_server_1b_ps_server_1b_port
       disk.iops_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.iops_oam_server_1c2
@@ -463,15 +466,15 @@ topology_template:
       disk.usage_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.usage_oam_server_1c2
-      network.incoming.bytes_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
       feature_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - feature_cmaui_1c1
       disk.read.requests_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.read.requests_cmaui_1c1
+      network.outpoing.packets_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.outpoing.packets_pd_server_1b_pd_server_1b_port
       network.outgoing.bytes_cmaui_port_2:
       - abstract_cmaui_1c1
       - network.outgoing.bytes_cmaui_1c1_cmaui_port
@@ -487,6 +490,9 @@ topology_template:
       network.outgoing.bytes_cmaui_port_1:
       - abstract_cmaui_1c1
       - network.outgoing.bytes_cmaui_1c1_cmaui_port
+      feature_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - feature_pd_server_1b_pd_server_1b_port
       network.outgoing.packets.rate_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.outgoing.packets.rate_oam_server_1c2_oam_port
@@ -505,12 +511,6 @@ topology_template:
       feature_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - feature_server_pd
-      network.incoming.packets_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.incoming.packets_pd_server_1b_pd_server_1b_port
-      attachment_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - attachment_pd_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.write.requests.rate_oam_server_1c2
@@ -562,12 +562,18 @@ topology_template:
       vcpus_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - vcpus_server_pd
+      network.outgoing.packets.rate_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port
       disk.device.read.requests_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.read.requests_server_pd
       feature_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - feature_pd_server_port_1
+      link_packet_internal_network_1:
+      - packet_internal_network_1
+      - link
       network.outpoing.packets_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - network.outpoing.packets_pd_server_port_1
@@ -619,6 +625,9 @@ topology_template:
       network.outpoing.packets_oam_port_1:
       - abstract_oam_server_1c2_0
       - network.outpoing.packets_oam_server_1c2_oam_port
+      attachment_packet_internal_network_1:
+      - packet_internal_network_1
+      - attachment
       network.outpoing.packets_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.outpoing.packets_oam_server_1c2_oam_port
@@ -631,6 +640,9 @@ topology_template:
       binding_cmaui_port_2:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1_cmaui_port
+      end_point_packet_internal_network_1:
+      - packet_internal_network_1
+      - end_point
       os_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - os_server_pd
@@ -640,6 +652,15 @@ topology_template:
       cpu_util_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu_util_oam_server_1c2
+      network.incoming.packets_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.packets_pd_server_1b_ps_server_1b_port
+      network.outgoing.bytes.rate_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port
+      network.outgoing.bytes_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
       attachment_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
       - attachment_pd_server_port_1
@@ -682,6 +703,9 @@ topology_template:
       disk.device.iops_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.iops_cmaui_1c1
+      network.outgoing.packets.rate_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
       memory.resident_server_1b_pd_2:
       - abstract_pd_server_1b
       - memory.resident_pd_server_1b
@@ -721,9 +745,6 @@ topology_template:
       feature_cmaui_port_1:
       - abstract_cmaui_1c1
       - feature_cmaui_1c1_cmaui_port
-      network.incoming.bytes.rate_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
       network.outgoing.bytes_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.outgoing.bytes_oam_server_1c2_oam_port
@@ -745,6 +766,9 @@ topology_template:
       instance_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - instance_cmaui_1c1
+      network.outgoing.bytes.rate_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
       attachment_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - attachment_pd_server_port_2
@@ -793,12 +817,12 @@ topology_template:
       endpoint_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - endpoint_cmaui_1c1
+      network.incoming.packets.rate_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port
       host_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - host_pd_server_1b
-      network.outgoing.packets.rate_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port
       disk.root.size_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.root.size_pd_server_1b
@@ -814,30 +838,18 @@ topology_template:
       disk.device.usage_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.usage_cmaui_1c1
-      network.incoming.bytes_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.incoming.bytes_pd_server_1b_ps_server_1b_port
       host_server_1b_pd_2:
       - abstract_pd_server_1b
       - host_pd_server_1b
-      attachment_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - attachment_pd_server_1b_pd_server_1b_port
       vcpus_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - vcpus_cmaui_1c1
-      binding_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - binding_pd_server_1b_ps_server_1b_port
       disk.device.latency_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.latency_oam_server_1c2
       disk.device.latency_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.latency_oam_server_1c2
-      feature_packet_external_network:
-      - packet_external_network
-      - feature
       disk.write.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.write.requests.rate_cmaui_1c1
@@ -850,6 +862,9 @@ topology_template:
       disk.allocation_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.allocation_pd_server_1b
+      attachment_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - attachment_pd_server_1b_ps_server_1b_port
       cpu_util_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - cpu_util_cmaui_1c1
@@ -862,15 +877,15 @@ topology_template:
       cpu_util_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - cpu_util_cmaui_1c1
+      binding_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - binding_pd_server_1b_pd_server_1b_port
       disk.device.latency_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.latency_server_pd
       disk.write.requests_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.write.requests_pd_server_1b
-      binding_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - binding_pd_server_1b_pd_server_1b_port
       disk.device.read.requests.rate_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.read.requests.rate_pd_server_1b
@@ -907,6 +922,9 @@ topology_template:
       network.outgoing.bytes.rate_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - network.outgoing.bytes.rate_pd_server_port_2
+      network.outgoing.bytes_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.outgoing.bytes_pd_server_1b_ps_server_1b_port
       disk.read.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.read.bytes.rate_cmaui_1c1
@@ -958,9 +976,6 @@ topology_template:
       memory.usage_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - memory.usage_pd_server_1b
-      network.outpoing.packets_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.outpoing.packets_pd_server_1b_ps_server_1b_port
       memory.usage_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - memory.usage_oam_server_1c2
@@ -970,9 +985,6 @@ topology_template:
       disk.latency_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.latency_pd_server_1b
-      attachment_packet_external_network:
-      - packet_external_network
-      - attachment
       disk.read.requests_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.read.requests_oam_server_1c2
@@ -997,9 +1009,6 @@ topology_template:
       disk.device.write.requests_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.write.requests_pd_server_1b
-      network.incoming.bytes.rate_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port
       cpu_util_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - cpu_util_server_pd
@@ -1036,6 +1045,9 @@ topology_template:
       memory.usage_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - memory.usage_cmaui_1c1
+      end_point_packet_external_network_1:
+      - packet_external_network_1
+      - end_point
       binding_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1
@@ -1045,9 +1057,6 @@ topology_template:
       binding_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - binding_cmaui_1c1
-      feature_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - feature_pd_server_1b_ps_server_1b_port
       disk.device.iops_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.iops_oam_server_1c2
@@ -1063,18 +1072,15 @@ topology_template:
       binding_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - binding_oam_server_1c2
+      network.incoming.bytes.rate_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.device.write.requests.rate_server_pd
-      attachment_packet_internal_network:
-      - packet_internal_network
-      - attachment
       disk.device.read.bytes.rate_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.device.read.bytes.rate_pd_server_1b
-      network.outgoing.packets.rate_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
       disk.write.requests.rate_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.write.requests.rate_pd_server_1b
@@ -1096,6 +1102,9 @@ topology_template:
       disk.device.read.bytes.rate_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.read.bytes.rate_pd_server_1b
+      network.incoming.bytes_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.incoming.bytes_pd_server_1b_ps_server_1b_port
       network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - network.outgoing.packets.rate_pd_server_port_2
@@ -1168,18 +1177,12 @@ topology_template:
       cpu_util_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - cpu_util_pd_server_1b
-      network.outgoing.bytes.rate_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port
       disk.write.requests_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.write.requests_server_pd
       feature_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - feature_pd_server_1b
-      network.incoming.packets.rate_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port
       disk.device.write.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.write.requests.rate_cmaui_1c1
@@ -1231,18 +1234,12 @@ topology_template:
       disk.iops_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.iops_pd_server_1b
-      end_point_packet_external_network:
-      - packet_external_network
-      - end_point
       cpu_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - cpu_server_pd
       disk.iops_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.iops_pd_server_1b
-      network.outpoing.packets_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.outpoing.packets_pd_server_1b_pd_server_1b_port
       disk.device.read.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.requests_cmaui_1c1
@@ -1264,15 +1261,15 @@ topology_template:
       disk.device.allocation_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.allocation_oam_server_1c2
-      network.outgoing.bytes_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
       disk.write.requests_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.write.requests_cmaui_1c1
       disk.write.requests_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.write.requests_cmaui_1c1
+      link_packet_external_network_1:
+      - packet_external_network_1
+      - link
       network.outgoing.bytes.rate_cmaui_port_2:
       - abstract_cmaui_1c1
       - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
@@ -1288,6 +1285,9 @@ topology_template:
       cpu_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - cpu_cmaui_1c1
+      network.outpoing.packets_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - network.outpoing.packets_pd_server_1b_ps_server_1b_port
       binding_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - binding_pd_server_port_2
@@ -1297,27 +1297,33 @@ topology_template:
       cpu_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu_oam_server_1c2
-      link_packet_external_network:
-      - packet_external_network
-      - link
       disk.device.read.bytes.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.bytes.rate_cmaui_1c1
       disk.device.read.bytes.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.bytes.rate_cmaui_1c1
+      attachment_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - attachment_pd_server_1b_pd_server_1b_port
       disk.write.requests.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.write.requests.rate_oam_server_1c2
       disk.device.read.bytes_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.read.bytes_pd_server_1b
+      attachment_packet_external_network_1:
+      - packet_external_network_1
+      - attachment
       cpu.delta_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - cpu.delta_oam_server_1c2
       disk.device.read.bytes_server_1b_pd_2:
       - abstract_pd_server_1b
       - disk.device.read.bytes_pd_server_1b
+      feature_packet_internal_network_1:
+      - packet_internal_network_1
+      - feature
       disk.iops_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.iops_server_pd
@@ -1336,15 +1342,9 @@ topology_template:
       disk.usage_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.usage_cmaui_1c1
-      end_point_packet_internal_network:
-      - packet_internal_network
-      - end_point
       network.incoming.bytes_oam_port_2:
       - abstract_oam_server_1c2_1
       - network.incoming.bytes_oam_server_1c2_oam_port
-      feature_packet_internal_network:
-      - packet_internal_network
-      - feature
       network.incoming.bytes_oam_port_1:
       - abstract_oam_server_1c2_0
       - network.incoming.bytes_oam_server_1c2_oam_port
@@ -1405,6 +1405,9 @@ topology_template:
       disk.device.read.requests.rate_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.device.read.requests.rate_cmaui_1c1
+      network.incoming.packets.rate_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
       endpoint_server_1b_pd_2:
       - abstract_pd_server_1b
       - endpoint_pd_server_1b
@@ -1417,18 +1420,15 @@ topology_template:
       disk.device.read.bytes_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.read.bytes_oam_server_1c2
+      network.incoming.bytes_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.incoming.bytes_pd_server_1b_pd_server_1b_port
       disk.device.read.requests.rate_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.read.requests.rate_cmaui_1c1
-      network.incoming.packets_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.incoming.packets_pd_server_1b_ps_server_1b_port
       instance_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - instance_server_pd
-      feature_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - feature_pd_server_1b_pd_server_1b_port
       disk.latency_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.latency_cmaui_1c1
@@ -1462,12 +1462,12 @@ topology_template:
       disk.device.read.bytes.rate_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - disk.device.read.bytes.rate_oam_server_1c2
+      feature_packet_external_network_1:
+      - packet_external_network_1
+      - feature
       disk.write.bytes_server_1c1_cmaui_1:
       - abstract_cmaui_1c1
       - disk.write.bytes_cmaui_1c1
-      network.outgoing.bytes.rate_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
       disk.write.bytes_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.write.bytes_cmaui_1c1
@@ -1483,9 +1483,6 @@ topology_template:
       disk.device.latency_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.latency_pd_server_1b
-      network.incoming.packets.rate_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
       feature_nested1_pattern_4:
       - nested1_pattern_4
       - feature
@@ -1501,9 +1498,6 @@ topology_template:
       disk.read.bytes_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.read.bytes_server_pd
-      link_packet_internal_network:
-      - packet_internal_network
-      - link
       disk.device.latency_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - disk.device.latency_cmaui_1c1
@@ -1540,9 +1534,6 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_1:
       - abstract_cmaui_1c1
       - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
-      network.outgoing.bytes_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - network.outgoing.bytes_pd_server_1b_ps_server_1b_port
       network.incoming.bytes.rate_cmaui_port_2:
       - abstract_cmaui_1c1
       - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
@@ -1558,6 +1549,9 @@ topology_template:
       disk.device.read.requests_server_1b_pd_1:
       - abstract_pd_server_1b_1
       - disk.device.read.requests_pd_server_1b
+      network.incoming.packets_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.incoming.packets_pd_server_1b_pd_server_1b_port
       disk.device.write.bytes_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - disk.device.write.bytes_oam_server_1c2
@@ -1570,9 +1564,15 @@ topology_template:
       disk.write.bytes_server_pd_nested1_pattern_4:
       - nested1_pattern_4
       - disk.write.bytes_server_pd
+      network.incoming.bytes.rate_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
       feature_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - feature_pd_server_port_2
+      feature_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - feature_pd_server_1b_ps_server_1b_port
       endpoint_server_1c2_oam_2:
       - abstract_oam_server_1c2_1
       - endpoint_oam_server_1c2
@@ -1580,9 +1580,6 @@ topology_template:
       - abstract_oam_server_1c2_0
       - endpoint_oam_server_1c2
     requirements:
-      link_pd_server_1b_port:
-      - abstract_pd_server_1b_1
-      - link_pd_server_1b_pd_server_1b_port
       dependency_oam_port_2:
       - abstract_oam_server_1c2_1
       - dependency_oam_server_1c2_oam_port
@@ -1595,12 +1592,9 @@ topology_template:
       link_pd_server_port_2_nested1_pattern_4:
       - nested1_pattern_4
       - link_pd_server_port_2
-      link_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - link_pd_server_1b_ps_server_1b_port
-      dependency_ps_server_1b_port:
-      - abstract_pd_server_1b
-      - dependency_pd_server_1b_ps_server_1b_port
+      dependency_pd_server_1b_port_1:
+      - abstract_pd_server_1b_1
+      - dependency_pd_server_1b_pd_server_1b_port
       dependency_server_1c2_oam_1:
       - abstract_oam_server_1c2_0
       - dependency_oam_server_1c2
@@ -1625,8 +1619,8 @@ topology_template:
       dependency_cmaui_port_2:
       - abstract_cmaui_1c1
       - dependency_cmaui_1c1_cmaui_port
-      dependency_packet_external_network:
-      - packet_external_network
+      dependency_packet_internal_network_1:
+      - packet_internal_network_1
       - dependency
       link_pd_server_port_1_nested1_pattern_4:
       - nested1_pattern_4
@@ -1646,12 +1640,18 @@ topology_template:
       dependency_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - dependency_cmaui_1c1
-      dependency_pd_server_1b_port:
+      link_pd_server_1b_port_1:
       - abstract_pd_server_1b_1
-      - dependency_pd_server_1b_pd_server_1b_port
-      dependency_packet_internal_network:
-      - packet_internal_network
+      - link_pd_server_1b_pd_server_1b_port
+      link_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - link_pd_server_1b_ps_server_1b_port
+      dependency_packet_external_network_1:
+      - packet_external_network_1
       - dependency
+      dependency_ps_server_1b_port_1:
+      - abstract_pd_server_1b
+      - dependency_pd_server_1b_ps_server_1b_port
       local_storage_server_1c1_cmaui_2:
       - abstract_cmaui_1c1
       - local_storage_cmaui_1c1
@@ -1666,4 +1666,4 @@ topology_template:
       - dependency
       dependency_server_1b_pd_2:
       - abstract_pd_server_1b
-      - dependency_pd_server_1b
+      - dependency_pd_server_1b
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested-no-compute.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested-no-compute.yml
index 5e0627f..2117609 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested-no-compute.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in/nested-no-compute.yml
@@ -35,27 +35,27 @@ parameters:
     type: string
 
 resources:
-  cmaui_port_1:
+  cmaui_port_01:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_internal_network}
+      network: {get_resource: packet_internal_network_0}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_02:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: packet_external_network}
+      network: {get_resource: packet_external_network_0}
       fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
       replacement_policy: AUTO
 
-  packet_internal_network:
+  packet_internal_network_0:
     type: OS::Neutron::Net
     properties:
       name:
         get_param: packet_internal_network_name
 
-  packet_external_network:
+  packet_external_network_0:
     type: OS::Neutron::Net
     properties:
       name:
@@ -64,4 +64,4 @@ resources:
 outputs:
   no_compute_attr_1:
     description: no_compute_attr_1
-    value: { get_resource: packet_external_network }
\ No newline at end of file
+    value: { get_resource: packet_external_network_0 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 391a1b7..697e584 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1461,217 +1461,217 @@ node_types:
         description: no_compute_attr_1
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_2:
+    - binding_cmaui_port_01:
         capability: tosca.capabilities.network.Bindable
         relationship: tosca.relationships.network.BindsTo
         occurrences:
         - 1
         - 1
-    - dependency_packet_external_network:
+    - dependency_cmaui_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_packet_internal_network:
+    - binding_cmaui_port_02:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_packet_internal_network_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_packet_external_network_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_1:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
     capabilities:
-      network.incoming.packets_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_packet_internal_network_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.incoming.packets_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_external_network_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.packets.rate_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      end_point_packet_internal_network:
-        type: tosca.capabilities.Endpoint
+      network.outgoing.packets.rate_cmaui_port_02:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_internal_network:
-        type: tosca.capabilities.network.Linkable
+      binding_cmaui_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_packet_internal_network:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_external_network:
+      end_point_packet_external_network_0:
         type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
+      attachment_cmaui_port_01:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      link_packet_internal_network_0:
+        type: tosca.capabilities.network.Linkable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.incoming.packets_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
+      attachment_packet_internal_network_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      network.outgoing.bytes.rate_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network:
-        type: tosca.capabilities.Attachment
+      end_point_packet_internal_network_0:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      link_packet_external_network_0:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_02:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_external_network:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      network.outgoing.bytes_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_external_network:
-        type: tosca.capabilities.network.Linkable
+      network.incoming.bytes.rate_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_external_network:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_packet_external_network_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested1:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -4671,4 +4671,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
index 76061f4..be3fbad 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
@@ -65,7 +65,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_2:
+    cmaui_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -83,23 +83,13 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network: packet_external_network
+        network: packet_internal_network_0
       requirements:
       - link:
           capability: tosca.capabilities.network.Linkable
-          node: packet_external_network
+          node: packet_internal_network_0
           relationship: tosca.relationships.network.LinksTo
-    packet_external_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_external_network_name
-    packet_internal_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_internal_network_name
-    cmaui_port_1:
+    cmaui_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -117,12 +107,22 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network: packet_internal_network
+        network: packet_external_network_0
       requirements:
       - link:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_external_network_0
           relationship: tosca.relationships.network.LinksTo
+    packet_internal_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_internal_network_name
+    packet_external_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_external_network_name
   groups:
     nested-no-compute_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -130,123 +130,123 @@ topology_template:
         heat_file: ../Artifacts/nested-no-compute.yml
         description: nested1
       members:
-      - cmaui_port_2
-      - packet_external_network
-      - packet_internal_network
-      - cmaui_port_1
+      - cmaui_port_01
+      - cmaui_port_02
+      - packet_internal_network_0
+      - packet_external_network_0
   outputs:
     no_compute_attr_1:
       description: no_compute_attr_1
-      value: packet_external_network
+      value: packet_external_network_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute
     capabilities:
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      feature_packet_internal_network_0:
+      - packet_internal_network_0
       - feature
-      end_point_packet_internal_network:
-      - packet_internal_network
-      - end_point
-      link_packet_internal_network:
-      - packet_internal_network
-      - link
-      feature_packet_internal_network:
-      - packet_internal_network
-      - feature
-      end_point_packet_external_network:
-      - packet_external_network
-      - end_point
-      attachment_cmaui_port_2:
-      - cmaui_port_2
+      network.incoming.packets_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.bytes
+      attachment_packet_external_network_0:
+      - packet_external_network_0
       - attachment
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.packets.rate_cmaui_port_01:
+      - cmaui_port_01
       - network.outgoing.packets.rate
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
-      binding_cmaui_port_1:
-      - cmaui_port_1
+      binding_cmaui_port_01:
+      - cmaui_port_01
       - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.packets.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.packets.rate
+      binding_cmaui_port_02:
+      - cmaui_port_02
       - binding
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      attachment_packet_internal_network:
-      - packet_internal_network
+      attachment_cmaui_port_02:
+      - cmaui_port_02
       - attachment
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      attachment_packet_external_network:
-      - packet_external_network
+      end_point_packet_external_network_0:
+      - packet_external_network_0
+      - end_point
+      attachment_cmaui_port_01:
+      - cmaui_port_01
       - attachment
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
+      network.incoming.packets.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.packets.rate
+      link_packet_internal_network_0:
+      - packet_internal_network_0
+      - link
+      network.incoming.bytes_cmaui_port_01:
+      - cmaui_port_01
       - network.incoming.bytes
-      link_packet_external_network:
-      - packet_external_network
+      network.incoming.packets_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.packets
+      network.incoming.packets.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.packets.rate
+      attachment_packet_internal_network_0:
+      - packet_internal_network_0
+      - attachment
+      network.outgoing.bytes.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.outgoing.bytes.rate
+      end_point_packet_internal_network_0:
+      - packet_internal_network_0
+      - end_point
+      network.outpoing.packets_cmaui_port_02:
+      - cmaui_port_02
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_01:
+      - cmaui_port_01
+      - network.outpoing.packets
+      link_packet_external_network_0:
+      - packet_external_network_0
       - link
-      feature_packet_external_network:
-      - packet_external_network
+      feature_cmaui_port_02:
+      - cmaui_port_02
+      - feature
+      feature_cmaui_port_01:
+      - cmaui_port_01
+      - feature
+      network.outgoing.bytes_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cmaui_port_01:
+      - cmaui_port_01
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.bytes.rate
+      feature_packet_external_network_0:
+      - packet_external_network_0
       - feature
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
     requirements:
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      dependency_packet_internal_network:
-      - packet_internal_network
+      dependency_packet_external_network_0:
+      - packet_external_network_0
       - dependency
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      dependency_packet_internal_network_0:
+      - packet_internal_network_0
       - dependency
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_cmaui_port_01:
+      - cmaui_port_01
       - dependency
-      dependency_packet_external_network:
-      - packet_external_network
+      binding_cmaui_port_01:
+      - cmaui_port_01
+      - binding
+      dependency_cmaui_port_02:
+      - cmaui_port_02
       - dependency
+      binding_cmaui_port_02:
+      - cmaui_port_02
+      - binding
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml
index 01f8757..ee1e27d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.1.yaml
@@ -57,7 +57,7 @@ parameters:
     description: the name of security group
 
 resources:
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -91,4 +91,4 @@ resources:
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml
index 01f8757..0c18b9c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/in/nested-pcm_v0.2.yaml
@@ -66,14 +66,14 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_02}
+        - port: { get_resource: pcm_port_12}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
 
-  pcm_port_0:
+  pcm_port_02:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -81,7 +81,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_12:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 92ea0fa..9ff008e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,43 +8,49 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
-        type: string
+      port_pcm_port_02_order:
+        type: integer
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_12_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_02_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+      availabilityzone_name:
         type: string
-        description: PCRF CM image name
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
+      port_pcm_port_12_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
+      port_pcm_port_02_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_02_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_12_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_02_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -58,29 +64,19 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_12_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
+      port_pcm_port_02_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -96,34 +92,28 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
+      port_pcm_port_12_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
-      pcm_vol:
+      port_pcm_port_12_subnetpoolid:
         type: string
-        description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
-        type: list
+      pcm_vol:
+        type: string
+        description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_02_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       cps_net_name:
@@ -141,29 +131,26 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_12_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_12_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_02_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_server_pcm:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -178,57 +165,63 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_12:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+    - dependency_pcm_port_02:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
+    - link_pcm_port_02:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
       cpu_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      memory_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      disk.write.requests_server_pcm:
         type: org.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_pcm:
+      network.incoming.packets_pcm_port_02:
         type: org.openecomp.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_02:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.outgoing.bytes_pcm_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -252,6 +245,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_pcm_port_02:
+        type: org.openecomp.capabilities.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -264,6 +263,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_12:
+        type: org.openecomp.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_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -276,12 +281,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_pcm_port_02:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_server_pcm:
         type: org.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_pcm_port_12:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.ephemeral.size_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -294,33 +309,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_02:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_pcm:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.bytes_pcm_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -349,74 +350,66 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      disk.device.read.bytes_server_pcm:
         type: org.openecomp.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_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_12:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      network.incoming.packets.rate_pcm_port_12:
         type: org.openecomp.capabilities.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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_pcm_port_12:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
+      endpoint_server_pcm:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.incoming.bytes.rate_pcm_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
+      attachment_pcm_port_12:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      vcpus_server_pcm:
         type: org.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_pcm:
+      disk.write.bytes_server_pcm:
         type: org.openecomp.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_pcm:
+      network.outgoing.packets.rate_pcm_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -457,61 +450,68 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      network.outgoing.bytes.rate_pcm_port_02:
         type: org.openecomp.capabilities.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_pcm:
+      network.outpoing.packets_pcm_port_12:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu.delta_server_pcm:
+      network.incoming.packets.rate_pcm_port_02:
         type: org.openecomp.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_pcm_port_1:
+      disk.write.requests.rate_server_pcm:
         type: org.openecomp.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_pcm_port_0:
+      binding_pcm_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
         type: org.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_pcm:
-        type: tosca.capabilities.network.Bindable
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      cpu.delta_server_pcm:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets_pcm_port_12:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -541,24 +541,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_pcm_port_12:
+        type: org.openecomp.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_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pcm:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcm:
+      network.outpoing.packets_pcm_port_02:
         type: org.openecomp.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_pcm_port_1:
+      disk.write.bytes.rate_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -723,14 +723,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
+    - local_storage_server_pcm_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -751,13 +751,13 @@ node_types:
         - 1
         - 1
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
+      network.incoming.packets.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -775,85 +775,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
-        type: org.openecomp.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_pcm:
-        type: org.openecomp.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_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcm:
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
+      network.incoming.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pcm:
+      cpu_util_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
-        type: org.openecomp.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_pcm_port_0:
+      memory.resident_server_pcm_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:
@@ -879,42 +861,30 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      memory.usage_server_pcm:
-        type: org.openecomp.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_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      network.outgoing.packets.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      network.outgoing.packets.rate_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      disk.allocation_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      disk.device.write.bytes_server_pcm_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:
@@ -925,13 +895,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      memory.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.outgoing.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -942,6 +912,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      cpu_server_pcm_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_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -958,84 +934,96 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
+      disk.device.read.bytes_server_pcm_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
+      endpoint_server_pcm_1:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      disk.read.bytes.rate_server_pcm_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_pcm:
+      disk.device.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      cpu.delta_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.device.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.read.requests_server_pcm_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
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.device.write.requests.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.ephemeral.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      disk.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      memory_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.device.read.bytes.rate_server_pcm_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:
@@ -1053,8 +1041,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.usage_server_pcm_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
@@ -1064,7 +1053,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.device.write.requests_server_pcm_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:
@@ -1076,32 +1065,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      disk.device.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
@@ -1111,7 +1100,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcm:
+      binding_server_pcm_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_pcm_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:
@@ -1417,4 +1417,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index c44e813..d2af2b9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -63,34 +63,34 @@ topology_template:
           get_input: pcm_flavor_name
         service_template_filter:
           substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml
-        port_pcm_port_1_network_role_tag: oam
+        port_pcm_port_12_mac_requirements:
+          mac_count_required:
+            is_required: false
         availabilityzone_name:
           get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_02_mac_requirements:
+          mac_count_required:
+            is_required: false
+        pcm_image_name:
+          get_input: pcm_image_name
+        port_pcm_port_02_network_role_tag: cps
+        pcm_server_name:
+          get_input:
+          - pcm_server_names
+          - 0
+        port_pcm_port_12_network_role_tag: oam
+        port_pcm_port_12_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        pcm_image_name:
-          get_input: pcm_image_name
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_02_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
-        pcm_server_name:
-          get_input:
-          - pcm_server_names
-          - 0
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1
       directives:
@@ -193,4 +193,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 8f2e346..e043127 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -175,9 +175,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
+    server_pcm_1:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
       properties:
         flavor:
@@ -219,7 +219,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested-pcm_v0.1_group:
@@ -229,69 +229,60 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - pcm_port_1
-      - server_pcm
+      - server_pcm_1
       - pcm_port_0
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1
     capabilities:
+      disk.root.size_server_pcm_1:
+      - server_pcm_1
+      - disk.root.size
       network.incoming.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
       network.incoming.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets.rate
       network.outpoing.packets_pcm_port_1:
       - pcm_port_1
       - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
       network.outpoing.packets_pcm_port_0:
       - pcm_port_0
       - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
-      - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
+      disk.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.iops
+      disk.device.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes.rate
+      disk.capacity_server_pcm_1:
+      - server_pcm_1
+      - disk.capacity
+      disk.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests
+      disk.read.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.read.bytes
       network.incoming.bytes_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes
+      disk.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.usage
+      cpu_util_server_pcm_1:
+      - server_pcm_1
+      - cpu_util
+      vcpus_server_pcm_1:
+      - server_pcm_1
+      - vcpus
+      memory.resident_server_pcm_1:
+      - server_pcm_1
+      - memory.resident
       network.incoming.bytes_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes
@@ -301,39 +292,36 @@ topology_template:
       binding_pcm_port_1:
       - pcm_port_1
       - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
-      - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
-      - disk.read.bytes
+      feature_server_pcm_1:
+      - server_pcm_1
+      - feature
       network.outgoing.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.packets.rate
       network.outgoing.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.packets.rate
+      disk.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.allocation
+      disk.device.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes
       feature_pcm_port_1:
       - pcm_port_1
       - feature
+      memory.usage_server_pcm_1:
+      - server_pcm_1
+      - memory.usage
       network.outgoing.bytes_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
       feature_pcm_port_0:
       - pcm_port_0
       - feature
+      cpu_server_pcm_1:
+      - server_pcm_1
+      - cpu
       network.outgoing.bytes_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes
@@ -343,87 +331,99 @@ topology_template:
       attachment_pcm_port_1:
       - pcm_port_1
       - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      disk.device.read.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes
+      endpoint_server_pcm_1:
+      - server_pcm_1
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
+      disk.device.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.device.iops
+      cpu.delta_server_pcm_1:
+      - server_pcm_1
+      - cpu.delta
+      host_server_pcm_1:
+      - server_pcm_1
+      - host
+      disk.device.capacity_server_pcm_1:
+      - server_pcm_1
+      - disk.device.capacity
+      disk.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests.rate
+      disk.ephemeral.size_server_pcm_1:
+      - server_pcm_1
+      - disk.ephemeral.size
+      disk.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.latency
+      scalable_server_pcm_1:
+      - server_pcm_1
       - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
+      disk.write.requests.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
-      - cpu.delta
+      memory_server_pcm_1:
+      - server_pcm_1
+      - memory
+      disk.device.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.device.latency
+      disk.device.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes.rate
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
       network.incoming.packets_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
-      - binding
+      disk.device.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.device.usage
       network.outgoing.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
-      - disk.device.capacity
+      disk.device.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests
       network.incoming.packets_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
-      - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
-      - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      disk.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.write.bytes
+      disk.device.read.requests_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
+      instance_server_pcm_1:
+      - server_pcm_1
+      - instance
+      disk.device.read.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests.rate
+      os_server_pcm_1:
+      - server_pcm_1
+      - os
       network.incoming.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      binding_server_pcm_1:
+      - server_pcm_1
+      - binding
+      disk.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.bytes.rate
+      disk.device.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.device.allocation
       network.incoming.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes.rate
@@ -434,15 +434,15 @@ topology_template:
       link_pcm_port_1:
       - pcm_port_1
       - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
+      dependency_server_pcm_1:
+      - server_pcm_1
+      - dependency
       dependency_pcm_port_0:
       - pcm_port_0
       - dependency
-      dependency_server_pcm:
-      - server_pcm
-      - dependency
       dependency_pcm_port_1:
       - pcm_port_1
       - dependency
+      local_storage_server_pcm_1:
+      - server_pcm_1
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 0fbb5e3..f6d3eae 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,39 +11,44 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
+    port_pcm_port_02_order:
+      type: integer
       required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
+    port_pcm_port_12_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_02_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
+    port_pcm_port_12_order:
+      type: integer
+      required: true
+    port_pcm_port_02_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_02_network_role_tag:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
-      type: string
+    port_pcm_port_12_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_02_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,26 +63,18 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_12_network_role:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
-      type: list
+    port_pcm_port_02_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -96,33 +93,28 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pcm_port_1_vlan_requirements:
+    port_pcm_port_12_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_12_subnetpoolid:
+      type: string
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_02_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     cps_net_name:
       label: CPS network name
@@ -142,80 +134,88 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_12_network_role_tag:
+      type: string
+      required: true
+    port_pcm_port_12_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_02_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
-    pcm_port_1:
+    server_pcm:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
+    pcm_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_12_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_12_network_role
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_12_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_12_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_12_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_12_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_12_network_role_tag
         network:
           get_input: oam_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_12_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_pcm
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
-    pcm_port_0:
+    pcm_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_02_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_02_network_role
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_02_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_02_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_02_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_02_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_02_network_role_tag
         network:
           get_input: cps_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_02_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -228,9 +228,9 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.2.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
       - server_pcm
-      - pcm_port_0
+      - pcm_port_12
+      - pcm_port_02
   outputs:
     server_pcm_id:
       description: the pcm nova service id
@@ -238,27 +238,24 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
       cpu_server_pcm:
       - server_pcm
       - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
       memory_server_pcm:
       - server_pcm
       - memory
       disk.write.requests_server_pcm:
       - server_pcm
       - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      network.incoming.packets_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.packets
+      feature_pcm_port_02:
+      - pcm_port_02
+      - feature
+      network.outgoing.bytes_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.bytes
       disk.device.iops_server_pcm:
       - server_pcm
       - disk.device.iops
@@ -268,42 +265,48 @@ topology_template:
       disk.device.write.requests_server_pcm:
       - server_pcm
       - disk.device.write.requests
+      network.incoming.bytes_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.bytes
       disk.device.usage_server_pcm:
       - server_pcm
       - disk.device.usage
       disk.allocation_server_pcm:
       - server_pcm
       - disk.allocation
+      network.incoming.bytes.rate_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.bytes.rate
       disk.usage_server_pcm:
       - server_pcm
       - disk.usage
       disk.device.write.bytes_server_pcm:
       - server_pcm
       - disk.device.write.bytes
+      attachment_pcm_port_02:
+      - pcm_port_02
+      - attachment
       disk.root.size_server_pcm:
       - server_pcm
       - disk.root.size
+      feature_pcm_port_12:
+      - pcm_port_12
+      - feature
       disk.ephemeral.size_server_pcm:
       - server_pcm
       - disk.ephemeral.size
       disk.device.latency_server_pcm:
       - server_pcm
       - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.packets.rate_pcm_port_02:
+      - pcm_port_02
+      - network.outgoing.packets.rate
       memory.usage_server_pcm:
       - server_pcm
       - memory.usage
+      network.outgoing.bytes_pcm_port_02:
+      - pcm_port_02
+      - network.outgoing.bytes
       disk.read.requests_server_pcm:
       - server_pcm
       - disk.read.requests
@@ -316,45 +319,39 @@ topology_template:
       disk.read.bytes_server_pcm:
       - server_pcm
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
       disk.device.read.bytes_server_pcm:
       - server_pcm
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
+      network.outgoing.bytes.rate_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.packets.rate
+      binding_pcm_port_12:
+      - pcm_port_12
+      - binding
       endpoint_server_pcm:
       - server_pcm
       - endpoint
+      network.incoming.bytes.rate_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_pcm:
       - server_pcm
       - disk.device.read.requests.rate
+      attachment_pcm_port_12:
+      - pcm_port_12
+      - attachment
       vcpus_server_pcm:
       - server_pcm
       - vcpus
       disk.write.bytes_server_pcm:
       - server_pcm
       - disk.write.bytes
+      network.outgoing.packets.rate_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.packets.rate
       disk.iops_server_pcm:
       - server_pcm
       - disk.iops
@@ -373,9 +370,21 @@ topology_template:
       cpu_util_server_pcm:
       - server_pcm
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_02:
+      - pcm_port_02
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_pcm_port_12:
+      - pcm_port_12
+      - network.outpoing.packets
+      network.incoming.packets.rate_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.packets.rate
       disk.write.requests.rate_server_pcm:
       - server_pcm
       - disk.write.requests.rate
+      binding_pcm_port_02:
+      - pcm_port_02
+      - binding
       disk.device.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.device.write.bytes.rate
@@ -385,24 +394,15 @@ topology_template:
       cpu.delta_server_pcm:
       - server_pcm
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
+      network.incoming.packets_pcm_port_12:
+      - pcm_port_12
       - network.incoming.packets
       binding_server_pcm:
       - server_pcm
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       instance_server_pcm:
       - server_pcm
       - instance
@@ -415,34 +415,34 @@ topology_template:
       disk.device.read.requests_server_pcm:
       - server_pcm
       - disk.device.read.requests
+      network.incoming.bytes_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.bytes
       feature_server_pcm:
       - server_pcm
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_02:
+      - pcm_port_02
+      - network.outpoing.packets
       disk.write.bytes.rate_server_pcm:
       - server_pcm
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_02:
+      - pcm_port_02
+      - dependency
       local_storage_server_pcm:
       - server_pcm
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_12:
+      - pcm_port_12
       - dependency
+      link_pcm_port_12:
+      - pcm_port_12
+      - link
       dependency_server_pcm:
       - server_pcm
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      link_pcm_port_02:
+      - pcm_port_02
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
index 7d8d512..3f422db 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
@@ -148,7 +148,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_20:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -165,9 +165,9 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Create vSON server 
-  vson_server:
+  vson_server_1:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_20]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       availability_zone: {get_param: [availability_zones, {get_param: instance_index}]}
@@ -181,7 +181,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_20}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
index 93f0fe7..9447289 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
@@ -134,7 +134,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_10:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -151,9 +151,9 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Create vSON server 
-  vson_server:
+  vson_server_3:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_10]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       block_device_mapping_v2:
@@ -170,7 +170,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_10}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
index 84cf6a7..02660dc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
@@ -145,7 +145,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_00:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -162,17 +162,17 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Attach Cinder volume to the server
-  vson_server_volume_attach:
+  vson_server_volume_attach_1:
     type: OS::Cinder::VolumeAttachment
-    depends_on: vson_server
+    depends_on: vson_server_2
     properties:
-      instance_uuid: {get_resource: vson_server}
+      instance_uuid: {get_resource: vson_server_2}
       volume_id: {get_param: [volume_ids, {get_param: instance_index}]}
 
 # Create vSON server 
-  vson_server:
+  vson_server_2:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_00]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       availability_zone: {get_param: [availability_zones, {get_param: instance_index}]}
@@ -186,7 +186,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_00}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9560424..d8c52bc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,12 +18,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -34,11 +28,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -62,20 +66,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -113,16 +109,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -137,6 +123,10 @@ node_types:
         status: SUPPORTED
         entry_schema: &id010
           type: string
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
@@ -144,19 +134,19 @@ node_types:
         status: SUPPORTED
         entry_schema: &id011
           type: string
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -164,337 +154,347 @@ node_types:
         status: SUPPORTED
         entry_schema: &id012
           type: string
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      instance_vson_server_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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      cpu_util_vson_server_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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_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_vson_server:
+      memory_vson_server_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      disk.allocation_vson_server_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_vson_server:
+      disk.write.requests.rate_vson_server_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.capacity_vson_server:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.read.bytes_vson_server_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.outpoing.packets_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.device.write.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.requests_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      memory.resident_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.read.requests_vson_server_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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.usage_vson_server_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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
+      vcpus_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_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_vson_server:
+      disk.iops_vson_server_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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_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
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1036,12 +1036,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -1057,6 +1055,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -1085,23 +1089,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -1125,6 +1117,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -1136,16 +1132,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -1173,17 +1159,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -1193,337 +1189,341 @@ node_types:
         status: SUPPORTED
         entry_schema: &id006
           type: string
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      instance_vson_server_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.usage_vson_server:
+      disk.device.write.bytes_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      disk.read.bytes_vson_server_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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
         type: org.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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      memory_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_00:
         type: org.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_vson_server:
+      cpu_util_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server_oam_net_port_0:
+      disk.allocation_vson_server_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_vson_server:
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      vcpus_vson_server:
+      network.incoming.packets_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      disk.capacity_vson_server_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_vson_server:
+      disk.device.read.bytes.rate_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.write.requests.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_vson_server:
+      disk.ephemeral.size_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.device.read.bytes_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.root.size_vson_server_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_vson_server:
+      disk.device.write.requests_vson_server_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.packets.rate_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_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_vson_server:
+      cpu.delta_vson_server_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.resident_vson_server:
+      disk.device.latency_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      memory.resident_vson_server_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_vson_server_oam_net_port_0:
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.usage_vson_server_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_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_vson_server:
+      vcpus_vson_server_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.delta_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_vson_server:
+      disk.write.bytes.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.iops_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      cpu_vson_server_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
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.allocation_vson_server_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
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -1542,12 +1542,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -1563,6 +1561,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -1590,23 +1594,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -1629,6 +1621,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -1640,16 +1636,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -1674,17 +1660,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -1693,337 +1689,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      instance_vson_server_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.usage_vson_server:
+      disk.device.write.bytes_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      disk.read.bytes_vson_server_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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
         type: org.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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.allocation_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
+      disk.device.read.bytes.rate_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.write.requests.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      disk.device.read.bytes_vson_server_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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_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.packets.rate_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      disk.device.latency_vson_server_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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_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_vson_server:
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.usage_vson_server_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_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.iops_vson_server_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
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -2042,12 +2042,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -2058,11 +2052,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -2085,20 +2089,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      vson_clm_oam_net_ip:
+      vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -2135,16 +2131,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -2157,362 +2143,376 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id010
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
         status: SUPPORTED
         entry_schema: *id011
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
         status: SUPPORTED
         entry_schema: *id012
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      instance_vson_server_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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      cpu_util_vson_server_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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_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_vson_server:
+      memory_vson_server_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      disk.allocation_vson_server_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_vson_server:
+      disk.write.requests.rate_vson_server_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.capacity_vson_server:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.read.bytes_vson_server_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.outpoing.packets_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.device.write.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.requests_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      memory.resident_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.read.requests_vson_server_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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.usage_vson_server_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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
+      vcpus_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_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_vson_server:
+      disk.iops_vson_server_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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_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
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2531,12 +2531,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -2552,6 +2550,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -2579,23 +2583,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -2618,6 +2610,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -2629,16 +2625,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -2663,17 +2649,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -2682,337 +2678,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      instance_vson_server_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.usage_vson_server:
+      disk.device.write.bytes_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      disk.read.bytes_vson_server_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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
         type: org.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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      cpu_util_vson_server_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_vson_server:
+      disk.device.read.requests.rate_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.allocation_vson_server_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_vson_server:
+      memory.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.usage_vson_server_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_vson_server:
+      network.incoming.packets_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      disk.capacity_vson_server_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_vson_server:
+      disk.device.read.bytes.rate_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.write.requests.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_vson_server:
+      disk.ephemeral.size_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.device.read.bytes_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.root.size_vson_server_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_vson_server:
+      disk.device.write.requests_vson_server_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.packets.rate_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_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_vson_server:
+      cpu.delta_vson_server_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.resident_vson_server:
+      disk.device.latency_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      memory.resident_vson_server_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_vson_server_oam_net_port_0:
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.usage_vson_server_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_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_vson_server:
+      vcpus_vson_server_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.delta_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_vson_server:
+      disk.write.bytes.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.iops_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      cpu_vson_server_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
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.allocation_vson_server_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
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -3031,12 +3031,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -3052,6 +3050,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -3079,23 +3083,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -3118,6 +3110,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -3129,16 +3125,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -3163,17 +3149,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -3182,337 +3178,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      instance_vson_server_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.usage_vson_server:
+      disk.device.write.bytes_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      disk.read.bytes_vson_server_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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
         type: org.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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.allocation_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
+      disk.device.read.bytes.rate_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.write.requests.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      disk.device.read.bytes_vson_server_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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_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.packets.rate_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      disk.device.latency_vson_server_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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_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_vson_server:
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.usage_vson_server_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_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.iops_vson_server_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
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -3531,12 +3531,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -3552,6 +3550,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -3579,23 +3583,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -3618,6 +3610,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -3629,25 +3625,15 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
+      availability_zones:
+        type: list
+        description: List of availability zones.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
+        entry_schema: *id003
+      volume_ids:
         type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      availability_zones:
-        type: list
-        description: List of availability zones.
-        required: true
-        status: SUPPORTED
-        entry_schema: *id003
-      volume_ids:
-        type: list
-        description: List of Volumes IDs.
+        description: List of Volumes IDs.
         required: true
         status: SUPPORTED
         entry_schema: *id004
@@ -3663,17 +3649,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -3682,337 +3678,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      instance_vson_server_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.usage_vson_server:
+      disk.device.write.bytes_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      disk.read.bytes_vson_server_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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
         type: org.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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.allocation_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
+      disk.device.read.bytes.rate_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_00:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.write.requests.rate_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      disk.device.read.bytes_vson_server_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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_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.packets.rate_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      disk.device.latency_vson_server_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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_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_vson_server:
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.usage_vson_server_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_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.iops_vson_server_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
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -4036,12 +4036,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -4075,6 +4069,12 @@ node_types:
         status: SUPPORTED
         entry_schema: &id013
           type: string
+      port_vson_server_oam_net_port_20_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
         type: string
         description: |
@@ -4091,7 +4091,7 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
+      port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -4100,14 +4100,6 @@ node_types:
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
@@ -4142,16 +4134,10 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
+      port_vson_server_oam_net_port_20_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -4166,19 +4152,33 @@ node_types:
         status: SUPPORTED
         entry_schema: &id016
           type: string
+      port_vson_server_oam_net_port_20_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vson_server_oam_net_port_20_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -4187,336 +4187,336 @@ node_types:
         entry_schema: &id017
           type: string
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_20:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_20:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      instance_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.device.write.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_vson_server:
+      disk.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.latency_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      disk.write.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_vson_server:
+      memory_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_vson_server:
+      cpu_util_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests.rate_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      disk.device.iops_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.usage_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_vson_server:
+      disk.allocation_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_vson_server:
+      memory.usage_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_vson_server:
+      disk.write.requests.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_vson_server:
+      disk.ephemeral.size_vson_server_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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_vson_server:
+      disk.device.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.root.size_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.write.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.device.write.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.device.latency_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      cpu.delta_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
+      network.outgoing.bytes_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      memory.resident_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_oam_net_port_20:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.read.bytes_vson_server:
+      disk.write.bytes_vson_server_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
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      disk.device.usage_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.write.requests.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_vson_server:
+      network.incoming.packets_vson_server_oam_net_port_20:
         type: org.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_vson_server:
+      vcpus_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      disk.iops_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_20:
         type: org.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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      attachment_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.allocation_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      cpu_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -4540,12 +4540,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -4578,6 +4572,12 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id013
+      port_vson_server_oam_net_port_20_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
         type: string
         description: |
@@ -4594,7 +4594,7 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
+      port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -4603,14 +4603,6 @@ node_types:
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
@@ -4644,16 +4636,10 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
+      port_vson_server_oam_net_port_20_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -4666,19 +4652,33 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id016
+      port_vson_server_oam_net_port_20_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vson_server_oam_net_port_20_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -4686,336 +4686,336 @@ node_types:
         status: SUPPORTED
         entry_schema: *id017
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_20:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_20:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      instance_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.device.write.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_vson_server:
+      disk.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_vson_server_oam_net_port_0:
+      disk.read.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.latency_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      disk.write.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_vson_server:
+      memory_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_vson_server:
+      cpu_util_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests.rate_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      disk.device.iops_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.usage_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_vson_server:
+      disk.allocation_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_vson_server:
+      memory.usage_vson_server_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_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_vson_server:
+      disk.write.requests.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_vson_server:
+      disk.ephemeral.size_vson_server_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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_vson_server:
+      disk.device.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.root.size_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.write.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.device.write.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      host_vson_server_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      cpu.delta_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      memory.resident_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      binding_vson_server_oam_net_port_20:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_vson_server:
+      disk.device.usage_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_vson_server:
+      disk.device.write.requests.rate_vson_server_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
-      scalable_vson_server:
+      scalable_vson_server_1:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_20:
         type: org.openecomp.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_vson_server:
+      vcpus_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.iops_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      disk.write.bytes.rate_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_20:
         type: org.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_vson_server:
-        type: tosca.capabilities.Node
+      attachment_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.device.allocation_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      cpu_vson_server_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_vson_server:
+      disk.device.capacity_vson_server_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:
@@ -5034,12 +5034,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -5050,11 +5044,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -5077,20 +5081,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -5127,16 +5123,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -5149,364 +5135,378 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id010
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
         status: SUPPORTED
         entry_schema: *id011
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
         status: SUPPORTED
         entry_schema: *id012
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      instance_vson_server_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_vson_server:
+      disk.latency_vson_server_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_vson_server:
+      cpu_util_vson_server_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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_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_vson_server:
+      memory_vson_server_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_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_vson_server:
+      disk.device.iops_vson_server_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_vson_server:
+      disk.capacity_vson_server_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_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_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_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      disk.allocation_vson_server_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_vson_server:
+      disk.write.requests.rate_vson_server_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.capacity_vson_server:
+      disk.ephemeral.size_vson_server_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_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.read.bytes_vson_server_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.outpoing.packets_vson_server_oam_net_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_vson_server:
+      disk.device.write.bytes.rate_vson_server_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_vson_server:
+      disk.device.write.requests_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_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.resident_vson_server:
+      cpu.delta_vson_server_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_vson_server:
+      memory.resident_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_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_vson_server:
+      disk.device.read.requests_vson_server_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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.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_vson_server:
+      disk.device.usage_vson_server_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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_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_vson_server:
+      vcpus_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_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_vson_server:
+      disk.iops_vson_server_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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_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
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index e1fcf51..c36094a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -1009,12 +1009,6 @@ topology_template:
           get_input: vson_cluster_name
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index: 0
         vnf_name:
           get_input: vnf_name
@@ -1033,11 +1027,9 @@ topology_template:
           get_input: vson_clm_image_name
         vnf_id:
           get_input: vnf_id
+        port_vson_server_oam_net_port_20_network_role_tag: oam
         vson_clm_oam_net_ip:
           get_input: vson_master_clm_ip
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_net_ips:
         - get_input: vson_clm_oam_net_ip_0
         swift_son_container_name:
@@ -1048,17 +1040,25 @@ topology_template:
         vson_server_group_id: UNSUPPORTED_RESOURCE_vson_clm_server_group
         vson_vm_flavor_name:
           get_input: vson_clm_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         ntp_servers:
           get_input: ntp_servers
+        port_vson_server_oam_net_port_20_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_20_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_clm_name_0
       requirements:
-      - dependency_vson_server:
+      - dependency_vson_server_1:
           capability: tosca.capabilities.Node
           node: oam_net_security_group
           relationship: tosca.relationships.DependsOn
@@ -1071,12 +1071,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1101,9 +1095,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1115,17 +1106,26 @@ topology_template:
           get_input: vson_mgt_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mgt_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mgt_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mgt_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dbs_volume_1:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -1149,12 +1149,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1164,6 +1159,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1181,9 +1182,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1191,11 +1189,13 @@ topology_template:
         vfc_role: dbc
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbc_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbc_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
@@ -1232,12 +1232,6 @@ topology_template:
         vson_cluster_name: ''
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1263,11 +1257,9 @@ topology_template:
           get_input: vson_clm_image_name
         vnf_id:
           get_input: vnf_id
+        port_vson_server_oam_net_port_20_network_role_tag: oam
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_net_ips:
         - get_input: vson_clm_oam_net_ip_0
         swift_son_container_name: ''
@@ -1278,11 +1270,19 @@ topology_template:
           get_input: vson_clm_server_group_id
         vson_vm_flavor_name:
           get_input: vson_clm_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         ntp_servers:
           get_input: ntp_servers
+        port_vson_server_oam_net_port_20_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_20_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
@@ -1350,12 +1350,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1380,9 +1374,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1394,17 +1385,26 @@ topology_template:
           get_input: vson_mdr_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mdr_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mdr_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mdr_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dbs_group:
       type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
@@ -1414,12 +1414,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1429,6 +1424,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1446,9 +1447,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1457,11 +1455,13 @@ topology_template:
         vfc_role: dbs
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbs_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbs_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -1652,31 +1652,31 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_20
           node: vson_clm_0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dcl_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbs_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbg_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_20
           node: vson_clm_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mdr_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_cll_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1684,15 +1684,15 @@ topology_template:
           node: vson_app_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbc_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mon_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mgt_group
           relationship: org.openecomp.relationships.AttachesTo
     vson_dbg_volume_0:
@@ -1718,12 +1718,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1733,6 +1728,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1750,9 +1751,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1760,11 +1758,13 @@ topology_template:
         vfc_role: dbg
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbg_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbg_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
@@ -1786,12 +1786,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1801,6 +1796,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1818,9 +1819,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1830,11 +1828,13 @@ topology_template:
         vfc_role: cll
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_leader_server_group_id
         vson_vm_flavor_name:
           get_input: vson_cll_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -1875,12 +1875,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1905,9 +1899,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1919,17 +1910,26 @@ topology_template:
           get_input: vson_mon_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mon_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mon_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mon_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dcl_group:
       type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
@@ -1939,12 +1939,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1954,6 +1949,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1971,9 +1972,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1983,11 +1981,13 @@ topology_template:
         vfc_role: dcl
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_leader_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dcl_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -2243,4 +2243,4 @@ topology_template:
       value: vson_dbs_volume_1
     vson_mon_server_group_id:
       description: ID of the Server Group intended for vSON MON instances.
-      value: UNSUPPORTED_RESOURCE_vson_mon_server_group
+      value: UNSUPPORTED_RESOURCE_vson_mon_server_group
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
index 1a22824..fa4b53a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
@@ -29,11 +29,6 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -73,6 +68,11 @@ topology_template:
       description: List of DNS servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_20_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     oam_net_security_group_id:
       label: OAM network security group ID
       hidden: false
@@ -92,7 +92,7 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
+    port_vson_server_oam_net_port_20_network_role_tag:
       type: string
       required: true
     vson_clm_oam_net_ip:
@@ -101,12 +101,6 @@ topology_template:
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
-      type: string
-      required: true
     oam_net_ips:
       label: vSON OAM network IP addresses
       hidden: false
@@ -147,14 +141,9 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
+    port_vson_server_oam_net_port_20_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -171,18 +160,29 @@ topology_template:
       description: List of NTP servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_20_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vson_server_oam_net_port_20_network_role:
+      type: string
+      required: true
+    port_vson_server_oam_net_port_20_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vson_server_oam_net_port_20_subnetpoolid:
+      type: string
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
+    port_vson_server_oam_net_port_20_order:
       type: integer
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vson_vm_names:
       label: vSON Cluster leader names
       hidden: false
@@ -192,7 +192,7 @@ topology_template:
       entry_schema:
         type: string
   node_templates:
-    vson_server:
+    vson_server_1:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -223,24 +223,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_20:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_20_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_20_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_20_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_20_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -254,19 +254,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_20_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_20_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_20_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_20_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_group:
@@ -276,177 +276,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_1
+      - vson_server_oam_net_port_20
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_4
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
+      instance_vson_server_1:
+      - vson_server_1
       - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
+      disk.device.write.bytes_vson_server_1:
+      - vson_server_1
       - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      disk.read.requests_vson_server_1:
+      - vson_server_1
+      - disk.read.requests
+      disk.read.bytes_vson_server_1:
+      - vson_server_1
+      - disk.read.bytes
+      disk.read.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.read.bytes.rate
+      disk.latency_vson_server_1:
+      - vson_server_1
+      - disk.latency
+      endpoint_vson_server_1:
+      - vson_server_1
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      disk.write.requests_vson_server_1:
+      - vson_server_1
+      - disk.write.requests
+      memory_vson_server_1:
+      - vson_server_1
+      - memory
+      cpu_util_vson_server_1:
+      - vson_server_1
+      - cpu_util
+      disk.device.read.requests.rate_vson_server_1:
+      - vson_server_1
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_1:
+      - vson_server_1
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.usage_vson_server_1:
+      - vson_server_1
+      - disk.usage
+      disk.allocation_vson_server_1:
+      - vson_server_1
+      - disk.allocation
+      disk.capacity_vson_server_1:
+      - vson_server_1
+      - disk.capacity
+      memory.usage_vson_server_1:
+      - vson_server_1
+      - memory.usage
+      disk.device.read.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.read.bytes.rate
+      disk.write.requests.rate_vson_server_1:
+      - vson_server_1
+      - disk.write.requests.rate
+      disk.ephemeral.size_vson_server_1:
+      - vson_server_1
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      feature_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - feature
+      disk.device.read.bytes_vson_server_1:
+      - vson_server_1
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      os_vson_server_1:
+      - vson_server_1
+      - os
+      feature_vson_server_1:
+      - vson_server_1
+      - feature
+      network.outpoing.packets_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
+      disk.root.size_vson_server_1:
+      - vson_server_1
+      - disk.root.size
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outgoing.packets.rate
+      disk.device.write.requests_vson_server_1:
+      - vson_server_1
+      - disk.device.write.requests
+      disk.device.write.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.write.bytes.rate
+      host_vson_server_1:
+      - vson_server_1
+      - host
+      disk.device.latency_vson_server_1:
+      - vson_server_1
+      - disk.device.latency
+      cpu.delta_vson_server_1:
+      - vson_server_1
       - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
-      - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
+      network.outgoing.bytes_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.bytes.rate
+      memory.resident_vson_server_1:
+      - vson_server_1
+      - memory.resident
+      binding_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - binding
-      host_vson_server:
-      - vson_server
-      - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.write.bytes_vson_server_1:
+      - vson_server_1
+      - disk.write.bytes
+      disk.device.usage_vson_server_1:
+      - vson_server_1
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.write.requests.rate
+      scalable_vson_server_1:
+      - vson_server_1
+      - scalable
+      network.incoming.packets_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.packets
+      vcpus_vson_server_1:
+      - vson_server_1
+      - vcpus
+      binding_vson_server_1:
+      - vson_server_1
       - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.packets.rate
+      disk.iops_vson_server_1:
+      - vson_server_1
+      - disk.iops
+      disk.write.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.write.bytes.rate
+      network.incoming.bytes_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.bytes
+      attachment_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - attachment
+      disk.device.allocation_vson_server_1:
+      - vson_server_1
+      - disk.device.allocation
+      cpu_vson_server_1:
+      - vson_server_1
+      - cpu
+      disk.device.read.requests_vson_server_1:
+      - vson_server_1
+      - disk.device.read.requests
+      disk.device.capacity_vson_server_1:
+      - vson_server_1
+      - disk.device.capacity
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      local_storage_vson_server_1:
+      - vson_server_1
+      - local_storage
+      link_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      dependency_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - dependency
-      local_storage_vson_server:
-      - vson_server
-      - local_storage
+      dependency_vson_server_1:
+      - vson_server_1
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
index 12f38c9..3ac286a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
@@ -23,11 +23,6 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -40,12 +35,20 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance.
+    port_vson_server_oam_net_port_10_network_role:
+      type: string
+      required: true
     oam_net_subnet_prefix_length:
       label: OAM net subnet prefix length
       hidden: false
       immutable: false
       type: string
       description: Prefix length of the subnet on the OAM network.
+    port_vson_server_oam_net_port_10_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     vf_module_name:
       label: VF module name
       hidden: false
@@ -73,19 +76,13 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
-      type: string
-      required: true
     vson_clm_oam_net_ip:
       label: vSON Cluster Manager IP
       hidden: false
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
+    port_vson_server_oam_net_port_10_subnetpoolid:
       type: string
       required: true
     vson_dc_unit:
@@ -128,14 +125,6 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -152,6 +141,9 @@ topology_template:
       description: List of Volumes IDs.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_network_role_tag:
+      type: string
+      required: true
     ntp_servers:
       label: NTP servers
       hidden: false
@@ -160,18 +152,18 @@ topology_template:
       description: List of NTP servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
+    port_vson_server_oam_net_port_10_order:
       type: integer
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vson_vm_names:
       label: vSON Cluster leader names
       hidden: false
@@ -180,8 +172,16 @@ topology_template:
       description: A list of unique names to be issued to the vSON Cluster leaders.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vson_server_oam_net_port_10_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
-    vson_server:
+    vson_server_3:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -210,24 +210,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_10:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_10_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_10_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_10_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_10_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -241,19 +241,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_10_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_10_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_10_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_10_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_3
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_from_vol_group:
@@ -263,177 +263,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance that's supposed to be booted from a Cinder volume.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_3
+      - vson_server_oam_net_port_10
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
-      - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
-      - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      endpoint_vson_server_3:
+      - vson_server_3
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.read.bytes_vson_server_3:
+      - vson_server_3
+      - disk.read.bytes
+      disk.read.requests_vson_server_3:
+      - vson_server_3
+      - disk.read.requests
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      binding_vson_server_3:
+      - vson_server_3
+      - binding
+      disk.read.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.read.bytes.rate
+      disk.device.write.bytes_vson_server_3:
+      - vson_server_3
+      - disk.device.write.bytes
+      instance_vson_server_3:
+      - vson_server_3
+      - instance
+      disk.latency_vson_server_3:
+      - vson_server_3
+      - disk.latency
+      cpu_util_vson_server_3:
+      - vson_server_3
+      - cpu_util
+      feature_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - feature
+      disk.write.requests_vson_server_3:
+      - vson_server_3
+      - disk.write.requests
+      memory_vson_server_3:
+      - vson_server_3
+      - memory
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outgoing.bytes.rate
+      disk.device.read.requests.rate_vson_server_3:
+      - vson_server_3
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_3:
+      - vson_server_3
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.capacity_vson_server_3:
+      - vson_server_3
+      - disk.capacity
+      memory.usage_vson_server_3:
+      - vson_server_3
+      - memory.usage
+      disk.usage_vson_server_3:
+      - vson_server_3
+      - disk.usage
+      disk.device.read.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.read.bytes.rate
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.allocation_vson_server_3:
+      - vson_server_3
+      - disk.allocation
+      disk.write.requests.rate_vson_server_3:
+      - vson_server_3
+      - disk.write.requests.rate
+      disk.ephemeral.size_vson_server_3:
+      - vson_server_3
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.bytes.rate
+      disk.device.read.bytes_vson_server_3:
+      - vson_server_3
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
-      - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
-      - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
+      binding_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - binding
-      host_vson_server:
-      - vson_server
+      os_vson_server_3:
+      - vson_server_3
+      - os
+      disk.root.size_vson_server_3:
+      - vson_server_3
+      - disk.root.size
+      disk.device.write.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.write.bytes.rate
+      disk.device.write.requests_vson_server_3:
+      - vson_server_3
+      - disk.device.write.requests
+      network.incoming.packets_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.packets
+      host_vson_server_3:
+      - vson_server_3
       - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      disk.device.latency_vson_server_3:
+      - vson_server_3
+      - disk.device.latency
+      cpu.delta_vson_server_3:
+      - vson_server_3
+      - cpu.delta
+      memory.resident_vson_server_3:
+      - vson_server_3
+      - memory.resident
+      attachment_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - attachment
+      network.incoming.bytes_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.bytes
+      feature_vson_server_3:
+      - vson_server_3
+      - feature
+      disk.write.bytes_vson_server_3:
+      - vson_server_3
+      - disk.write.bytes
+      disk.device.read.requests_vson_server_3:
+      - vson_server_3
+      - disk.device.read.requests
+      network.outpoing.packets_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outpoing.packets
+      disk.device.usage_vson_server_3:
+      - vson_server_3
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.write.requests.rate
+      vcpus_vson_server_3:
+      - vson_server_3
+      - vcpus
+      disk.write.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.write.bytes.rate
+      disk.iops_vson_server_3:
+      - vson_server_3
+      - disk.iops
+      scalable_vson_server_3:
+      - vson_server_3
+      - scalable
+      disk.device.capacity_vson_server_3:
+      - vson_server_3
+      - disk.device.capacity
+      disk.device.allocation_vson_server_3:
+      - vson_server_3
+      - disk.device.allocation
+      cpu_vson_server_3:
+      - vson_server_3
+      - cpu
+      network.outgoing.bytes_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outgoing.bytes
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - dependency
-      local_storage_vson_server:
-      - vson_server
+      local_storage_vson_server_3:
+      - vson_server_3
       - local_storage
+      dependency_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - dependency
+      link_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - link
+      dependency_vson_server_3:
+      - vson_server_3
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
index 8be5401..8292248 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
@@ -23,11 +23,9 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
+    port_vson_server_oam_net_port_00_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -46,6 +44,11 @@ topology_template:
       immutable: false
       type: string
       description: Prefix length of the subnet on the OAM network.
+    port_vson_server_oam_net_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     vf_module_name:
       label: VF module name
       hidden: false
@@ -79,21 +82,12 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
-      type: string
-      required: true
     vson_clm_oam_net_ip:
       label: vSON Cluster Manager IP
       hidden: false
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
-      type: string
-      required: true
     vson_dc_unit:
       label: vSON Data Center name
       hidden: false
@@ -121,6 +115,9 @@ topology_template:
       type: string
       description: |
         Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
+    port_vson_server_oam_net_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     vson_server_group_id:
       label: vSON server group ID
       hidden: false
@@ -134,14 +131,6 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -173,17 +162,25 @@ topology_template:
       type: string
       description: "Authentication Token generated for the user permitted to add \
         \ a new Datacenter/vSON member to existing vSON Cluster. \n"
+    port_vson_server_oam_net_port_00_order:
+      type: integer
+      required: true
+    port_vson_server_oam_net_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
-      type: integer
+    port_vson_server_oam_net_port_00_vlan_requirements:
+      type: list
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_vson_server_oam_net_port_00_network_role:
+      type: string
       required: true
     vson_vm_names:
       label: vSON Cluster leader names
@@ -193,8 +190,11 @@ topology_template:
       description: A list of unique names to be issued to the vSON Cluster leaders.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_00_subnetpoolid:
+      type: string
+      required: true
   node_templates:
-    vson_server:
+    vson_server_2:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -225,24 +225,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_00_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_00_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_00_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -256,19 +256,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_00_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_2
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_with_vol_group:
@@ -278,177 +278,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_2
+      - vson_server_oam_net_port_00
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
+      network.outpoing.packets_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.bytes.rate
+      instance_vson_server_2:
+      - vson_server_2
       - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
+      disk.device.write.bytes_vson_server_2:
+      - vson_server_2
       - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      disk.read.requests_vson_server_2:
+      - vson_server_2
+      - disk.read.requests
+      disk.read.bytes_vson_server_2:
+      - vson_server_2
+      - disk.read.bytes
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.packets.rate
+      disk.latency_vson_server_2:
+      - vson_server_2
+      - disk.latency
+      disk.read.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.read.bytes.rate
+      endpoint_vson_server_2:
+      - vson_server_2
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.bytes.rate
+      disk.write.requests_vson_server_2:
+      - vson_server_2
+      - disk.write.requests
+      binding_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - binding
+      memory_vson_server_2:
+      - vson_server_2
+      - memory
+      network.outgoing.bytes_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.bytes
+      cpu_util_vson_server_2:
+      - vson_server_2
+      - cpu_util
+      disk.device.read.requests.rate_vson_server_2:
+      - vson_server_2
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_2:
+      - vson_server_2
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.allocation_vson_server_2:
+      - vson_server_2
+      - disk.allocation
+      memory.usage_vson_server_2:
+      - vson_server_2
+      - memory.usage
+      disk.usage_vson_server_2:
+      - vson_server_2
+      - disk.usage
+      network.incoming.packets_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.packets
+      disk.capacity_vson_server_2:
+      - vson_server_2
+      - disk.capacity
+      disk.device.read.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.read.bytes.rate
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.packets.rate
+      network.incoming.bytes_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.bytes
+      disk.write.requests.rate_vson_server_2:
+      - vson_server_2
+      - disk.write.requests.rate
+      attachment_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - attachment
+      disk.ephemeral.size_vson_server_2:
+      - vson_server_2
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      disk.device.read.bytes_vson_server_2:
+      - vson_server_2
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
+      os_vson_server_2:
+      - vson_server_2
+      - os
+      disk.root.size_vson_server_2:
+      - vson_server_2
+      - disk.root.size
+      disk.device.write.requests_vson_server_2:
+      - vson_server_2
+      - disk.device.write.requests
+      host_vson_server_2:
+      - vson_server_2
+      - host
+      disk.device.write.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.write.bytes.rate
+      cpu.delta_vson_server_2:
+      - vson_server_2
       - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
+      disk.device.latency_vson_server_2:
+      - vson_server_2
+      - disk.device.latency
+      feature_vson_server_2:
+      - vson_server_2
       - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
-      - binding
-      host_vson_server:
-      - vson_server
-      - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      memory.resident_vson_server_2:
+      - vson_server_2
+      - memory.resident
+      disk.write.bytes_vson_server_2:
+      - vson_server_2
+      - disk.write.bytes
+      disk.device.usage_vson_server_2:
+      - vson_server_2
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.write.requests.rate
+      scalable_vson_server_2:
+      - vson_server_2
+      - scalable
+      vcpus_vson_server_2:
+      - vson_server_2
+      - vcpus
+      binding_vson_server_2:
+      - vson_server_2
       - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      disk.write.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.write.bytes.rate
+      disk.iops_vson_server_2:
+      - vson_server_2
+      - disk.iops
+      cpu_vson_server_2:
+      - vson_server_2
+      - cpu
+      feature_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - feature
+      disk.device.allocation_vson_server_2:
+      - vson_server_2
+      - disk.device.allocation
+      disk.device.read.requests_vson_server_2:
+      - vson_server_2
+      - disk.device.read.requests
+      disk.device.capacity_vson_server_2:
+      - vson_server_2
+      - disk.device.capacity
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - dependency
-      local_storage_vson_server:
-      - vson_server
+      local_storage_vson_server_2:
+      - vson_server_2
       - local_storage
+      dependency_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - dependency
+      link_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - link
+      dependency_vson_server_2:
+      - vson_server_2
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml
index c73fcf6..d59f16e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested1.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml
index b4655fa..dca4585 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested2.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml
index 5553883..157b085 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested3.yml
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml
index ce3ffb7..0e689ef 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in/nested4.yml
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: p2},{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 535f2ea..21183ac 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -419,47 +419,58 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_8:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_8:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_4:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_8:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_8:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -475,61 +486,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8:
+      disk.device.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7:
+      attachment_cmaui_port_8:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -539,121 +548,110 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      disk.device.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.device.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7:
+      disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8:
+      memory_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -675,13 +673,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8:
+      instance_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -693,24 +691,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -722,7 +709,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -741,6 +728,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_8:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -748,44 +741,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      cpu.delta_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory.resident_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8:
+      network.outgoing.bytes.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_8:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -795,7 +789,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -807,13 +801,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2013,14 +2013,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -2047,6 +2047,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -2087,6 +2101,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -2100,14 +2128,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -2140,34 +2168,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -2182,24 +2182,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2218,39 +2201,38 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2260,8 +2242,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.requests_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2278,73 +2261,89 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested2Level:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2362,7 +2361,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2385,12 +2396,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2403,52 +2409,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2466,35 +2457,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2509,58 +2489,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2578,49 +2548,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2642,274 +2612,252 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested2Level:
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -2925,59 +2873,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2988,7 +2919,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2999,47 +2930,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3051,127 +2977,120 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_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
-      cpu_util_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.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.
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_4_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:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      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
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3189,62 +3108,60 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3257,36 +3174,36 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3297,19 +3214,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3326,142 +3243,140 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2Level:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3473,30 +3388,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.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:
@@ -3518,19 +3439,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_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
-      memory.resident_server_cmaui_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
+      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:
@@ -3542,25 +3475,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3574,37 +3524,49 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3628,13 +3590,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu.delta_server_cmaui_test_nested2Level:
+      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:
@@ -3650,13 +3624,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3668,18 +3654,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4314,19 +4314,33 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_4:
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_4:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_4:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_cmaui_port_4:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
-        - 1
+        - 1
     - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -4354,6 +4368,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -4367,14 +4395,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -4407,161 +4435,109 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested3Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4572,26 +4548,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4600,191 +4577,191 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_4:
+      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4795,7 +4772,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      disk.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4808,24 +4785,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4841,7 +4801,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4853,19 +4813,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4884,19 +4849,24 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4908,194 +4878,208 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_4:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_4:
+      disk.write.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_4:
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.allocation_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5107,41 +5091,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5155,39 +5145,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -5197,81 +5190,72 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
+      host_server_cmaui_2:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5283,65 +5267,69 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_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
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      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:
+      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.bytes.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:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_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_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5353,25 +5341,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_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_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_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:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      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:
@@ -5383,110 +5370,121 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_4:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      binding_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level:
+      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
-      binding_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3:
+      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
-      network.incoming.bytes.rate_cmaui_port_4:
+      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
-      network.outgoing.bytes_cmaui_port_5_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.outpoing.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_4:
+      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
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      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:
@@ -5499,13 +5497,15 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -5514,49 +5514,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      disk.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5636,6 +5636,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -5649,14 +5663,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -5689,245 +5703,251 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    capabilities:
+      memory.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    capabilities:
-      cpu.delta_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.root.size_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level:
+      disk.latency_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.iops_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.device.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level:
+      disk.device.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      disk.write.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.read.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      memory_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6:
+      cpu.delta_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.incoming.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
+      disk.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -5937,17 +5957,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_5:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -5968,30 +5983,31 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6021,32 +6037,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -6062,20 +6080,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_5:
+      feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -6084,19 +6101,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6107,12 +6112,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_8_test_nested4Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -6120,19 +6119,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_5:
+      disk.write.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6143,77 +6142,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5:
+      vcpus_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_8_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_5:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_8_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6224,19 +6209,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6247,30 +6232,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6:
+      memory_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level:
+      disk.root.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6283,88 +6267,97 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.latency_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6:
+      network.incoming.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6376,19 +6369,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outgoing.bytes_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6:
+      network.outpoing.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6:
+      disk.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -6400,56 +6393,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_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.read.bytes_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_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
-      network.incoming.bytes.rate_cmaui_port_5:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      cpu.delta_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level:
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      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
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
index c3d230d..ace6aa3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
@@ -144,99 +144,105 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.write.requests.rate_cmaui
-      disk.device.allocation_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.allocation_cmaui
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_6_test_nested3Level
       binding_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_6_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested3Level
-      host_server_cmaui:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
       - abstract_cmaui_2
-      - host_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_cmaui
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.root.size_cmaui
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
+      - scalable_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_2:
       - abstract_cmaui_2
       - network.outgoing.bytes_cmaui_cmaui_port_2
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.read.requests_cmaui
       network.outgoing.bytes_cmaui_port_1:
       - abstract_cmaui_2
       - network.outgoing.bytes_cmaui_cmaui_port_1
       binding_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_5_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - endpoint_server_cmaui_2
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.latency_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_3
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.read.bytes.rate_cmaui
+      feature_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.read.bytes_cmaui
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
       - abstract_cmaui_2
-      - instance_cmaui
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_cmaui
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.write.requests.rate_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_6_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
@@ -246,129 +252,105 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
-      os_server_cmaui:
-      - abstract_cmaui_2
-      - os_cmaui
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_2
       binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_7_test_nested4Level_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_4
-      disk.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.ephemeral.size_cmaui
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_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.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui:
-      - abstract_cmaui_2
-      - feature_cmaui
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_1:
       - abstract_cmaui_2
       - binding_cmaui_cmaui_port_1
       binding_cmaui_port_2:
       - abstract_cmaui_2
       - binding_cmaui_cmaui_port_2
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - abstract_cmaui_2
-      - memory.usage_cmaui
-      disk.ephemeral.size_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.ephemeral.size_cmaui
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests_cmaui
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
+      - 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.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - 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
-      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:
+      disk.device.write.bytes.rate_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.device.iops_cmaui
+      - disk.device.write.bytes.rate_cmaui
+      cpu_util_server_cmaui_1:
+      - abstract_cmaui_2
+      - cpu_util_cmaui
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes_cmaui_port_2:
       - abstract_cmaui_2
       - network.incoming.bytes_cmaui_cmaui_port_2
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_1:
       - abstract_cmaui_2
       - network.incoming.bytes_cmaui_cmaui_port_1
       network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_5_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.write.bytes.rate_cmaui
+      disk.device.write.bytes_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.write.bytes_cmaui
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - abstract_cmaui_2
       - network.incoming.packets.rate_cmaui_cmaui_port_1
       network.incoming.packets.rate_cmaui_port_2:
       - abstract_cmaui_2
       - network.incoming.packets.rate_cmaui_cmaui_port_2
-      cpu_server_cmaui:
-      - abstract_cmaui_2
-      - cpu_cmaui
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
@@ -378,402 +360,369 @@ topology_template:
       feature_cmaui_port_2:
       - abstract_cmaui_2
       - feature_cmaui_cmaui_port_2
-      disk.device.read.bytes.rate_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.read.bytes.rate_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.latency_cmaui
-      disk.read.requests_server_cmaui:
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.read.requests_cmaui
-      disk.usage_server_cmaui:
-      - abstract_cmaui_2
-      - disk.usage_cmaui
-      disk.device.usage_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.usage_cmaui
-      disk.capacity_server_cmaui:
-      - abstract_cmaui_2
-      - disk.capacity_cmaui
-      disk.write.requests.rate_server_cmaui:
+      - binding_cmaui
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.write.requests.rate_cmaui
+      - scalable_cmaui
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui:
+      endpoint_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.device.read.requests_cmaui
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
+      - endpoint_cmaui
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - abstract_cmaui_2
-      - binding_cmaui
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
-      disk.device.read.requests.rate_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.read.requests.rate_cmaui
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.allocation_cmaui
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
+      memory_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.write.bytes_cmaui
-      endpoint_server_cmaui_test_nested2Level:
+      - memory_cmaui
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - os_server_cmaui_2
       network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_5_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - 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.capacity_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.capacity_cmaui
+      disk.device.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.device.iops_server_cmaui_2
       network.incoming.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_4
       feature_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_5_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
+      - abstract_cmaui_2
+      - instance_cmaui
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
+      - memory_server_cmaui_3_test_nested3Level
       attachment_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_3
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - abstract_cmaui_2
-      - vcpus_cmaui
-      disk.device.write.bytes_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.write.bytes_cmaui
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - abstract_cmaui_2
-      - disk.allocation_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_1:
       - abstract_cmaui_2
       - network.outpoing.packets_cmaui_cmaui_port_1
       network.outpoing.packets_cmaui_port_2:
       - abstract_cmaui_2
       - network.outpoing.packets_cmaui_cmaui_port_2
+      disk.device.read.requests_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.read.requests_cmaui
+      cpu.delta_server_cmaui_1:
+      - abstract_cmaui_2
+      - cpu.delta_cmaui
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - abstract_cmaui_2
-      - cpu.delta_cmaui
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       feature_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
       attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - abstract_cmaui_2
-      - scalable_cmaui
-      disk.read.bytes.rate_server_cmaui:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.read.bytes.rate_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.usage_cmaui
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_3
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
       - abstract_cmaui_2
-      - cpu_util_cmaui
-      disk.device.write.requests_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.write.requests_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_cmaui
+      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
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_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.device.write.bytes.rate_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.iops_cmaui
       network.outgoing.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_4
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.read.bytes_cmaui
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_5_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui:
-      - abstract_cmaui_2
-      - disk.root.size_cmaui
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - abstract_cmaui_2
+      - cpu_cmaui
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.allocation_server_cmaui_2
       network.incoming.packets_cmaui_port_2:
       - abstract_cmaui_2
       - network.incoming.packets_cmaui_cmaui_port_2
-      disk.device.write.bytes.rate_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.write.bytes.rate_cmaui
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level
       network.incoming.packets_cmaui_port_1:
       - abstract_cmaui_2
       - network.incoming.packets_cmaui_cmaui_port_1
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.capacity_cmaui
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.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
-      - cpu_util_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - host_server_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
       binding_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_4
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_4
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.iops_cmaui
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
+      - disk.device.usage_server_cmaui_2
       feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_2:
       - abstract_cmaui_2
       - network.outgoing.bytes.rate_cmaui_cmaui_port_2
-      disk.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_1:
       - abstract_cmaui_2
       - network.outgoing.bytes.rate_cmaui_cmaui_port_1
       attachment_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_4
-      memory.usage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - abstract_cmaui_2
-      - disk.iops_cmaui
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_4
-      disk.read.bytes_server_cmaui:
-      - abstract_cmaui_2
-      - disk.read.bytes_cmaui
-      disk.read.requests_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.write.bytes.rate_cmaui
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_cmaui
+      feature_server_cmaui_1:
+      - abstract_cmaui_2
+      - feature_cmaui
+      disk.allocation_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.allocation_cmaui
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
       attachment_cmaui_port_2:
       - abstract_cmaui_2
       - attachment_cmaui_cmaui_port_2
-      disk.device.capacity_server_cmaui:
-      - abstract_cmaui_2
-      - disk.device.capacity_cmaui
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_1:
       - abstract_cmaui_2
       - network.outgoing.packets.rate_cmaui_cmaui_port_1
@@ -783,39 +732,51 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_3
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       attachment_cmaui_port_1:
       - abstract_cmaui_2
       - attachment_cmaui_cmaui_port_1
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.write.requests_cmaui
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.usage_cmaui
       network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - 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
-      memory_server_cmaui:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
       - abstract_cmaui_2
-      - memory_cmaui
-      scalable_server_cmaui_test_nested2Level:
+      - os_cmaui
+      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
       feature_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_4
@@ -825,51 +786,72 @@ topology_template:
       attachment_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
+      - disk.ephemeral.size_server_cmaui_2
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - abstract_cmaui_2
+      - host_cmaui
       feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_4
       binding_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_3
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - abstract_cmaui_2
-      - memory.resident_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - abstract_cmaui_2
-      - disk.latency_cmaui
-      disk.allocation_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.device.read.requests.rate_cmaui
       network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_6_test_nested3Level
@@ -879,40 +861,58 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2:
       - abstract_cmaui_2
       - network.incoming.bytes.rate_cmaui_cmaui_port_2
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
       - abstract_cmaui_2
-      - disk.write.requests_cmaui
-      cpu.delta_server_cmaui_test_nested2Level:
+      - vcpus_cmaui
+      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
       feature_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_6_test_nested3Level
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.read.bytes.rate_cmaui
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_3
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_3
-      endpoint_server_cmaui:
+      memory.resident_server_cmaui_1:
       - abstract_cmaui_2
-      - endpoint_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_cmaui
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - abstract_cmaui_2
+      - disk.latency_cmaui
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
-    requirements:
-      dependency_server_cmaui:
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
       - abstract_cmaui_2
-      - dependency_cmaui
+      - memory.usage_cmaui
+    requirements:
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_5_test_nested3Level
@@ -937,42 +937,42 @@ topology_template:
       link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_7_test_nested4Level_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       dependency_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_3
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_3_test_nested3Level
       dependency_cmaui_port_1:
       - abstract_cmaui_2
       - dependency_cmaui_cmaui_port_1
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       link_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_6_test_nested3Level
-      dependency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui
       dependency_cmaui_port_2:
       - abstract_cmaui_2
       - dependency_cmaui_cmaui_port_2
       link_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_4
-      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_5_test_nested3Level
-      local_storage_server_cmaui:
+      - 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
+      local_storage_server_cmaui_1:
       - abstract_cmaui_2
       - local_storage_cmaui
-      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:
+      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - dependency_cmaui_port_5_test_nested3Level
       link_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_3
@@ -985,9 +985,9 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_1:
+      - abstract_cmaui_2
+      - dependency_cmaui
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_4
+      - dependency_cmaui_port_4
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index c3425ca..33ae55e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -151,504 +151,489 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - abstract_cmaui_1
-      - cpu.delta_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.write.requests.rate_cmaui
-      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:
-      - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.allocation_cmaui
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      scalable_server_cmaui:
+      - cpu_util_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
       - abstract_cmaui_1
-      - scalable_cmaui
-      disk.read.bytes.rate_server_cmaui:
-      - abstract_cmaui_1
-      - disk.read.bytes.rate_cmaui
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.usage_cmaui
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.latency_cmaui
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_2:
       - abstract_cmaui_1
-      - host_cmaui
-      cpu_util_server_cmaui:
+      - disk.root.size_cmaui
+      disk.device.write.requests.rate_server_cmaui_2:
       - abstract_cmaui_1
-      - cpu_util_cmaui
-      os_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.write.requests.rate_cmaui
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.write.bytes.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_3
-      disk.device.write.requests_server_cmaui:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.device.write.requests_cmaui
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_cmaui
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      feature_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.iops_cmaui
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.capacity_cmaui
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
-      memory.usage_server_cmaui_test_nested3Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
+      - host_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes.rate_server_cmaui_2:
       - abstract_cmaui_1
-      - instance_cmaui
-      disk.device.read.bytes_server_cmaui:
+      - disk.device.read.bytes.rate_cmaui
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.read.bytes_cmaui
+      disk.device.read.bytes_server_cmaui_2:
       - abstract_cmaui_1
       - disk.device.read.bytes_cmaui
-      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:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.root.size_cmaui
-      memory_server_cmaui_test_nested3Level:
+      - disk.write.requests.rate_cmaui
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
+      - disk.iops_server_cmaui_4_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
-      network.incoming.packets_cmaui_port_3:
+      memory_server_cmaui_2:
       - abstract_cmaui_1
-      - network.incoming.packets_cmaui_cmaui_port_3
-      os_server_cmaui:
+      - memory_cmaui
+      cpu_server_cmaui_2:
       - abstract_cmaui_1
-      - os_cmaui
-      disk.device.write.bytes.rate_server_cmaui:
+      - cpu_cmaui
+      host_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - host_server_cmaui_3
+      network.incoming.packets_cmaui_port_3:
       - abstract_cmaui_1
-      - disk.device.write.bytes.rate_cmaui
+      - network.incoming.packets_cmaui_cmaui_port_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.incoming.packets_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.packets_cmaui_cmaui_port_4
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.ephemeral.size_cmaui
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.capacity_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_6
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
-      disk.allocation_server_cmaui_test_nested3Level:
-      - 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:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - abstract_cmaui_1
-      - feature_cmaui
+      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_3
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
+      disk.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.iops_cmaui
       binding_cmaui_port_4:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_4
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
       - abstract_cmaui_1
-      - memory.usage_cmaui
+      - disk.device.write.requests_cmaui
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
       feature_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - abstract_cmaui_1
-      - disk.ephemeral.size_cmaui
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_3
-      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
+      disk.root.size_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_4
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
-      disk.iops_server_cmaui:
-      - abstract_cmaui_1
-      - disk.iops_cmaui
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_3
       network.incoming.bytes_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.bytes_cmaui_cmaui_port_4
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
       - abstract_cmaui_1
       - network.incoming.bytes_cmaui_cmaui_port_3
-      disk.device.iops_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.iops_cmaui
-      disk.read.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.read.bytes_cmaui
-      disk.root.size_server_cmaui_test_nested3Level:
+      - cpu_util_cmaui
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes.rate_cmaui
+      disk.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.write.bytes.rate_cmaui
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes_cmaui
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
-      cpu_server_cmaui:
-      - abstract_cmaui_1
-      - cpu_cmaui
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.incoming.packets.rate_cmaui_cmaui_port_3
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
       feature_cmaui_port_3:
       - abstract_cmaui_1
       - feature_cmaui_cmaui_port_3
+      disk.write.bytes_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.write.bytes_cmaui
       network.incoming.packets.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.packets.rate_cmaui_cmaui_port_4
+      feature_server_cmaui_2:
+      - abstract_cmaui_1
+      - feature_cmaui
       feature_cmaui_port_4:
       - abstract_cmaui_1
       - feature_cmaui_cmaui_port_4
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
-      disk.write.bytes.rate_server_cmaui:
-      - abstract_cmaui_1
-      - disk.write.bytes.rate_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.device.read.bytes.rate_cmaui
+      - disk.allocation_cmaui
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - abstract_cmaui_1
+      - binding_cmaui
+      vcpus_server_cmaui_2:
+      - abstract_cmaui_1
+      - vcpus_cmaui
       network.outgoing.packets.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.packets.rate_cmaui_cmaui_port_4
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
+      - instance_server_cmaui_3
       attachment_cmaui_port_3:
       - abstract_cmaui_1
       - attachment_cmaui_cmaui_port_3
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
       - abstract_cmaui_1
       - attachment_cmaui_cmaui_port_4
-      disk.iops_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
+      scalable_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.device.latency_cmaui
-      disk.read.requests_server_cmaui:
-      - abstract_cmaui_1
-      - disk.read.requests_cmaui
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      - scalable_cmaui
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.capacity_cmaui
-      disk.usage_server_cmaui:
-      - abstract_cmaui_1
-      - disk.usage_cmaui
+      - disk.capacity_server_cmaui_4_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.packets.rate_cmaui_cmaui_port_3
-      disk.device.usage_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.usage_cmaui
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_5
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.capacity_cmaui
-      disk.write.requests.rate_server_cmaui:
-      - abstract_cmaui_1
-      - disk.write.requests.rate_cmaui
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests_cmaui
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.usage_cmaui
+      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.device.latency_server_cmaui
+      - disk.write.bytes_server_cmaui_3
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
       binding_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_7_test_nested4Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.device.read.requests_cmaui
+      - endpoint_cmaui
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
-      memory_server_cmaui:
+      os_server_cmaui_2:
       - abstract_cmaui_1
-      - memory_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - os_cmaui
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
-      binding_server_cmaui:
-      - abstract_cmaui_1
-      - binding_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.device.read.requests.rate_cmaui
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
+      - disk.device.allocation_cmaui
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - abstract_cmaui_1
-      - disk.write.bytes_cmaui
-      host_server_cmaui_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_5
+      host_server_cmaui_2:
+      - abstract_cmaui_1
+      - host_cmaui
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_3
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.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.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_8_test_nested4Level
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      instance_server_cmaui_2:
+      - abstract_cmaui_1
+      - instance_cmaui
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
+      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      memory.resident_server_cmaui:
-      - abstract_cmaui_1
-      - memory.resident_cmaui
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - abstract_cmaui_1
-      - disk.latency_cmaui
+      - disk.allocation_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
-      vcpus_server_cmaui:
-      - abstract_cmaui_1
-      - vcpus_cmaui
       network.outgoing.bytes_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_4
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - abstract_cmaui_1
-      - disk.device.write.bytes_cmaui
-      instance_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - instance_server_cmaui
       binding_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_5
@@ -658,91 +643,106 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.bytes.rate_cmaui_cmaui_port_4
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.read.requests_cmaui
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu_util_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
       - abstract_cmaui_1
-      - disk.allocation_cmaui
-      disk.write.requests_server_cmaui:
+      - disk.read.bytes.rate_cmaui
+      network.outpoing.packets_cmaui_port_3:
       - abstract_cmaui_1
-      - disk.write.requests_cmaui
-      cpu_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
+      - network.outpoing.packets_cmaui_cmaui_port_3
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
-      network.outpoing.packets_cmaui_port_3:
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
       - abstract_cmaui_1
-      - network.outpoing.packets_cmaui_cmaui_port_3
+      - cpu.delta_cmaui
+      disk.device.read.requests.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.read.requests.rate_cmaui
       network.outpoing.packets_cmaui_port_4:
       - abstract_cmaui_1
       - network.outpoing.packets_cmaui_cmaui_port_4
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - abstract_cmaui_1
+      - memory.resident_cmaui
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_8_test_nested4Level
-      scalable_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - abstract_cmaui_1
-      - endpoint_cmaui
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_cmaui_3
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
       network.incoming.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_5
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.latency_cmaui
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
+      - disk.ephemeral.size_server_cmaui_3
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_5
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - abstract_cmaui_1
+      - memory.usage_cmaui
     requirements:
       link_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_5
-      dependency_server_cmaui_test_nested3Level:
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3
       dependency_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_6
-      dependency_server_cmaui:
-      - abstract_cmaui_1
-      - dependency_cmaui
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
+      local_storage_server_cmaui_2:
+      - abstract_cmaui_1
+      - local_storage_cmaui
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
@@ -752,18 +752,18 @@ topology_template:
       link_cmaui_port_3:
       - abstract_cmaui_1
       - link_cmaui_cmaui_port_3
-      local_storage_server_cmaui:
-      - abstract_cmaui_1
-      - local_storage_cmaui
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       link_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_6
       link_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_8_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
@@ -773,6 +773,9 @@ topology_template:
       dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
+      dependency_server_cmaui_2:
+      - abstract_cmaui_1
+      - dependency_cmaui
       dependency_cmaui_port_4:
       - abstract_cmaui_1
       - dependency_cmaui_cmaui_port_4
@@ -781,7 +784,4 @@ topology_template:
       - dependency_cmaui_cmaui_port_3
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
+      - dependency_cmaui_port_5
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index f312efd..d8eca3f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -164,129 +164,138 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      cpu.delta_server_cmaui:
-      - abstract_cmaui
-      - cpu.delta_cmaui
-      disk.device.write.requests.rate_server_cmaui:
+      memory.usage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - cpu_util_server_cmaui_4
+      disk.device.usage_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.write.requests.rate_cmaui
-      disk.device.allocation_server_cmaui:
+      - disk.device.usage_cmaui
+      disk.device.latency_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.allocation_cmaui
-      memory_server_cmaui_test_nested4Level:
+      - disk.device.latency_cmaui
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      scalable_server_cmaui:
+      - disk.read.requests_server_cmaui_4
+      disk.root.size_server_cmaui_3:
       - abstract_cmaui
-      - scalable_cmaui
-      disk.read.bytes.rate_server_cmaui:
+      - disk.root.size_cmaui
+      disk.device.write.requests.rate_server_cmaui_3:
       - abstract_cmaui
-      - disk.read.bytes.rate_cmaui
-      instance_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - disk.device.write.requests.rate_cmaui
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
       - abstract_cmaui
-      - host_cmaui
-      cpu_util_server_cmaui:
+      - disk.read.requests_cmaui
+      disk.device.iops_server_cmaui_3:
       - abstract_cmaui
-      - cpu_util_cmaui
-      cpu_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.usage_server_cmaui
-      disk.device.write.requests_server_cmaui:
+      - disk.device.iops_cmaui
+      disk.device.capacity_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.write.requests_cmaui
+      - disk.device.capacity_cmaui
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - abstract_cmaui
+      - disk.device.read.bytes.rate_cmaui
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_7
-      instance_server_cmaui:
-      - abstract_cmaui
-      - instance_cmaui
-      disk.latency_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.latency_server_cmaui
-      disk.device.read.bytes_server_cmaui:
-      - abstract_cmaui
-      - disk.device.read.bytes_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - abstract_cmaui
+      - disk.read.bytes_cmaui
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_8
-      disk.root.size_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.read.requests_server_cmaui_4
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_3:
       - abstract_cmaui
-      - disk.root.size_cmaui
-      host_server_cmaui_test_nested4Level:
+      - disk.write.requests.rate_cmaui
+      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
-      - host_server_cmaui
-      os_server_cmaui:
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
       - abstract_cmaui
-      - os_cmaui
-      disk.device.write.bytes.rate_server_cmaui:
+      - disk.device.read.bytes_cmaui
+      memory_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.write.bytes.rate_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      - memory_cmaui
+      memory.resident_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - abstract_cmaui
+      - cpu_cmaui
+      binding_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - binding_server_cmaui_4
       network.incoming.packets_cmaui_port_5:
       - abstract_cmaui
       - network.incoming.packets_cmaui_cmaui_port_5
+      os_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - os_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_7
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
+      - abstract_cmaui
+      - disk.ephemeral.size_cmaui
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - cpu.delta_server_cmaui_4
       network.incoming.packets_cmaui_port_6:
       - abstract_cmaui
       - network.incoming.packets_cmaui_cmaui_port_6
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      disk.capacity_server_cmaui_3:
+      - abstract_cmaui
+      - disk.capacity_cmaui
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_7
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outgoing.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_cmaui_port_8
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - abstract_cmaui
-      - feature_cmaui
+      - vcpus_server_cmaui_4
       binding_cmaui_port_5:
       - abstract_cmaui
       - binding_cmaui_cmaui_port_5
@@ -296,21 +305,21 @@ topology_template:
       binding_cmaui_port_6:
       - abstract_cmaui
       - binding_cmaui_cmaui_port_6
+      disk.device.write.requests_server_cmaui_3:
+      - abstract_cmaui
+      - disk.device.write.requests_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui:
-      - abstract_cmaui
-      - memory.usage_cmaui
-      disk.ephemeral.size_server_cmaui:
-      - abstract_cmaui
-      - disk.ephemeral.size_cmaui
-      feature_server_cmaui_test_nested4Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - abstract_cmaui
+      - disk.iops_cmaui
       network.outgoing.bytes.rate_cmaui_port_6:
       - abstract_cmaui
       - network.outgoing.bytes.rate_cmaui_cmaui_port_6
@@ -323,75 +332,78 @@ topology_template:
       network.incoming.bytes_cmaui_port_5:
       - abstract_cmaui
       - network.incoming.bytes_cmaui_cmaui_port_5
-      disk.iops_server_cmaui:
+      host_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
       - abstract_cmaui
-      - disk.iops_cmaui
-      disk.device.iops_server_cmaui:
+      - cpu_util_cmaui
+      disk.device.write.bytes.rate_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.iops_cmaui
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
+      - disk.device.write.bytes.rate_cmaui
+      disk.write.bytes.rate_server_cmaui_3:
       - abstract_cmaui
-      - disk.read.bytes_cmaui
-      scalable_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - scalable_server_cmaui
+      - disk.write.bytes.rate_cmaui
+      disk.device.write.bytes_server_cmaui_3:
+      - abstract_cmaui
+      - disk.device.write.bytes_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_8
       network.outpoing.packets_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_8
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - abstract_cmaui
+      - feature_cmaui
       feature_cmaui_port_5:
       - abstract_cmaui
       - feature_cmaui_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
       feature_cmaui_port_6:
       - abstract_cmaui
       - feature_cmaui_cmaui_port_6
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - abstract_cmaui
-      - cpu_cmaui
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
+      - cpu_server_cmaui_4
       attachment_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_7
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
       binding_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_8
+      disk.write.bytes_server_cmaui_3:
+      - abstract_cmaui
+      - disk.write.bytes_cmaui
       network.incoming.packets.rate_cmaui_port_5:
       - abstract_cmaui
       - network.incoming.packets.rate_cmaui_cmaui_port_5
-      disk.write.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_3:
       - abstract_cmaui
-      - disk.write.bytes.rate_cmaui
-      disk.device.read.bytes.rate_server_cmaui:
-      - abstract_cmaui
-      - disk.device.read.bytes.rate_cmaui
+      - disk.allocation_cmaui
       attachment_cmaui_port_6:
       - abstract_cmaui
       - attachment_cmaui_cmaui_port_6
+      binding_server_cmaui_3:
+      - abstract_cmaui
+      - binding_cmaui
+      vcpus_server_cmaui_3:
+      - abstract_cmaui
+      - vcpus_cmaui
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_7
+      instance_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - instance_server_cmaui_4
       network.outgoing.packets.rate_cmaui_port_5:
       - abstract_cmaui
       - network.outgoing.packets.rate_cmaui_cmaui_port_5
+      scalable_server_cmaui_3:
+      - abstract_cmaui
+      - scalable_cmaui
       network.outgoing.packets.rate_cmaui_port_6:
       - abstract_cmaui
       - network.outgoing.packets.rate_cmaui_cmaui_port_6
@@ -401,166 +413,154 @@ topology_template:
       feature_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_8
-      disk.device.latency_server_cmaui:
-      - abstract_cmaui
-      - disk.device.latency_cmaui
-      disk.read.requests_server_cmaui:
-      - abstract_cmaui
-      - disk.read.requests_cmaui
-      disk.device.capacity_server_cmaui:
-      - abstract_cmaui
-      - disk.device.capacity_cmaui
-      disk.usage_server_cmaui:
-      - abstract_cmaui
-      - disk.usage_cmaui
-      disk.device.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3:
       - abstract_cmaui
-      - disk.device.usage_cmaui
+      - disk.write.requests_cmaui
       network.outpoing.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_7
-      disk.capacity_server_cmaui:
-      - abstract_cmaui
-      - disk.capacity_cmaui
-      disk.write.requests.rate_server_cmaui:
-      - abstract_cmaui
-      - disk.write.requests.rate_cmaui
       attachment_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_8
+      disk.usage_server_cmaui_3:
+      - abstract_cmaui
+      - disk.usage_cmaui
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_8
-      disk.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - abstract_cmaui
-      - disk.device.read.requests_cmaui
       feature_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_7
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - abstract_cmaui
+      - endpoint_cmaui
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_6:
       - abstract_cmaui
       - network.incoming.packets.rate_cmaui_cmaui_port_6
-      memory_server_cmaui:
+      os_server_cmaui_3:
       - abstract_cmaui
-      - memory_cmaui
-      cpu.delta_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      - os_cmaui
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
+      - disk.root.size_server_cmaui_4
       binding_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_7
-      binding_server_cmaui:
-      - abstract_cmaui
-      - binding_cmaui
-      disk.device.read.requests.rate_server_cmaui:
-      - abstract_cmaui
-      - disk.device.read.requests.rate_cmaui
-      disk.write.bytes_server_cmaui:
+      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:
       - abstract_cmaui
-      - disk.write.bytes_cmaui
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      - disk.device.allocation_cmaui
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_7
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      - disk.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.allocation_server_cmaui_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - network.outgoing.bytes_cmaui_port_7
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - abstract_cmaui
+      - host_cmaui
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       network.incoming.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_cmaui_port_7
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
       network.incoming.bytes.rate_cmaui_port_6:
       - abstract_cmaui
       - network.incoming.bytes.rate_cmaui_cmaui_port_6
-      memory.resident_server_cmaui:
+      instance_server_cmaui_3:
       - abstract_cmaui
-      - memory.resident_cmaui
+      - instance_cmaui
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
       network.outpoing.packets_cmaui_port_5:
       - abstract_cmaui
       - network.outpoing.packets_cmaui_cmaui_port_5
-      disk.latency_server_cmaui:
-      - abstract_cmaui
-      - disk.latency_cmaui
       network.outgoing.bytes_cmaui_port_6:
       - abstract_cmaui
       - network.outgoing.bytes_cmaui_cmaui_port_6
       network.outpoing.packets_cmaui_port_6:
       - abstract_cmaui
       - network.outpoing.packets_cmaui_cmaui_port_6
+      disk.read.bytes.rate_server_cmaui_3:
+      - abstract_cmaui
+      - disk.read.bytes.rate_cmaui
       network.outgoing.bytes_cmaui_port_5:
       - abstract_cmaui
       - network.outgoing.bytes_cmaui_cmaui_port_5
-      vcpus_server_cmaui:
-      - abstract_cmaui
-      - vcpus_cmaui
-      disk.device.write.bytes_server_cmaui:
-      - abstract_cmaui
-      - disk.device.write.bytes_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_cmaui_port_5:
       - abstract_cmaui
       - network.incoming.bytes.rate_cmaui_cmaui_port_5
-      disk.allocation_server_cmaui:
+      disk.device.read.requests_server_cmaui_3:
       - abstract_cmaui
-      - disk.allocation_cmaui
-      disk.write.requests_server_cmaui:
-      - abstract_cmaui
-      - disk.write.requests_cmaui
+      - disk.device.read.requests_cmaui
       network.incoming.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_7
-      endpoint_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3:
       - abstract_cmaui
-      - endpoint_cmaui
+      - disk.device.read.requests.rate_cmaui
+      cpu.delta_server_cmaui_3:
+      - abstract_cmaui
+      - cpu.delta_cmaui
+      memory.resident_server_cmaui_3:
+      - abstract_cmaui
+      - memory.resident_cmaui
+      disk.latency_server_cmaui_3:
+      - abstract_cmaui
+      - disk.latency_cmaui
+      memory.usage_server_cmaui_3:
+      - abstract_cmaui
+      - memory.usage_cmaui
     requirements:
       dependency_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_7
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_cmaui_port_6:
       - abstract_cmaui
       - dependency_cmaui_cmaui_port_6
-      dependency_server_cmaui:
-      - abstract_cmaui
-      - dependency_cmaui
       dependency_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_8
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - abstract_cmaui
+      - local_storage_cmaui
       link_cmaui_port_6:
       - abstract_cmaui
       - link_cmaui_cmaui_port_6
@@ -573,15 +573,15 @@ topology_template:
       link_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_8
-      local_storage_server_cmaui:
-      - abstract_cmaui
-      - local_storage_cmaui
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_7
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - abstract_cmaui
+      - dependency_cmaui
       dependency_cmaui_port_5:
       - abstract_cmaui
-      - dependency_cmaui_cmaui_port_5
+      - dependency_cmaui_cmaui_port_5
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
index afcc568..1d43dd8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
@@ -147,8 +147,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_4:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -182,21 +195,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -205,119 +205,119 @@ topology_template:
         description: nested4
       members:
       - cmaui_port_7
+      - server_cmaui_4
       - cmaui_port_8
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.cmaui
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes
+      disk.device.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes
+      feature_server_cmaui_4:
+      - server_cmaui_4
+      - feature
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
       feature_cmaui_port_7:
       - cmaui_port_7
       - feature
       feature_cmaui_port_8:
       - cmaui_port_8
       - feature
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.requests
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
       network.outgoing.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.packets.rate
       attachment_cmaui_port_7:
       - cmaui_port_7
       - attachment
+      vcpus_server_cmaui_4:
+      - server_cmaui_4
+      - vcpus
+      binding_server_cmaui_4:
+      - server_cmaui_4
+      - binding
+      disk.root.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests.rate
       attachment_cmaui_port_8:
       - cmaui_port_8
       - attachment
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       network.outgoing.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
       network.incoming.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
       network.incoming.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.packets.rate
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.device.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes
+      memory_server_cmaui_4:
+      - server_cmaui_4
+      - memory
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
       network.incoming.packets_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets
@@ -327,53 +327,53 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes.rate
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.incoming.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.outgoing.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outpoing.packets_cmaui_port_7:
       - cmaui_port_7
       - network.outpoing.packets
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_8:
       - cmaui_port_8
       - network.outpoing.packets
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       binding_cmaui_port_7:
       - cmaui_port_7
       - binding
       network.outgoing.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       binding_cmaui_port_8:
       - cmaui_port_8
       - binding
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
       - disk.ephemeral.size
       network.outgoing.bytes.rate_cmaui_port_7:
       - cmaui_port_7
@@ -381,24 +381,24 @@ topology_template:
       network.incoming.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.incoming.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
       network.outgoing.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes.rate
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_4:
+      - server_cmaui_4
+      - memory.usage
+      cpu_util_server_cmaui_4:
+      - server_cmaui_4
+      - cpu_util
     requirements:
       dependency_cmaui_port_8:
       - cmaui_port_8
@@ -412,9 +412,9 @@ topology_template:
       link_cmaui_port_7:
       - cmaui_port_7
       - link
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml
index 77d7e26..caf8e40 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/in/nested-oam_v0.1.yaml
@@ -66,10 +66,10 @@ resources:
       flavor: { get_param: oam_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -77,7 +77,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c73d702..2a56194 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -582,43 +582,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       oam_server_name:
         type: string
         description: oam server name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_00_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -632,24 +630,20 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_00_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -675,31 +669,37 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -715,8 +715,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -739,27 +739,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -772,37 +772,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory_server_oam:
         type: org.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      disk.write.requests_server_oam:
         type: org.openecomp.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_oam:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -820,154 +818,136 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_oam:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_oam:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.capabilities.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_oam:
+      disk.device.write.requests_server_oam:
         type: org.openecomp.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_oam:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_oam:
+      disk.allocation_server_oam:
         type: org.openecomp.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_pcm_port_0:
+      disk.device.usage_server_oam:
         type: org.openecomp.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_oam:
+      disk.usage_server_oam:
         type: org.openecomp.capabilities.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_oam:
+      disk.device.write.bytes_server_oam:
         type: org.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.read.bytes_server_oam:
+      disk.ephemeral.size_server_oam:
         type: org.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_oam:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.requests_server_oam:
+      disk.device.latency_server_oam:
         type: org.openecomp.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_oam:
+      disk.root.size_server_oam:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_oam:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.bytes_server_oam:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_oam:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.requests_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_oam:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_oam:
+        type: org.openecomp.capabilities.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_oam:
+      network.incoming.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -978,6 +958,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1037,55 +1023,69 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_oam:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.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_oam:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.packets.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_oam:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      cpu.delta_server_oam:
         type: org.openecomp.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_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_oam:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_oam:
+      binding_pcm_port_00:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.device.write.bytes.rate_server_oam:
         type: org.openecomp.capabilities.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_oam:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_oam:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1120,7 +1120,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1132,7 +1132,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2016,4 +2016,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
index 924328f..13c01e0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
@@ -184,17 +184,19 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: oam
-        availabilityzone_name:
-          get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_00_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        availabilityzone_name:
+          get_input: availabilityzone_name
         oam_net_gw:
           get_input: oam_net_gw
+        port_pcm_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         oam_flavor_name:
           get_input: oam_flavor_name
         security_group_name:
@@ -203,29 +205,26 @@ topology_template:
           get_input:
           - cps_net_ips
           - 0
+        port_pcm_port_01_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_server_name:
           get_input:
           - oam_server_names
           - 0
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_pcm_port_00_network_role_tag: cps
         service_template_filter:
           substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_vol:
           get_input:
           - pcm_volumes
           - 0
-        port_pcm_port_1_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_image_name:
           get_input: oam_image_name
         cps_net_name:
@@ -240,6 +239,7 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
+        port_pcm_port_01_network_role_tag: oam
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
@@ -395,4 +395,4 @@ topology_template:
       - server_pcm_001
       - packet_mirror_network
       - compute_port_0
-      - abstract_compute
+      - abstract_compute
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 815fc7c..5abcd8c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_01_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     oam_server_name:
       label: oam server name
       hidden: false
       immutable: false
       type: string
       description: oam server name
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     oam_image_name:
@@ -58,22 +57,19 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
+    port_pcm_port_00_network_role:
+      type: string
+      required: true
+    port_pcm_port_00_ip_requirements:
       type: list
       required: true
       entry_schema:
@@ -102,28 +98,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
+      required: true
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -142,8 +142,8 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
     server_oam:
@@ -158,63 +158,63 @@ topology_template:
         config_drive: true
         name:
           get_input: oam_server_name
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_oam
           relationship: tosca.relationships.network.BindsTo
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -228,8 +228,8 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - server_oam
-      - pcm_port_1
-      - pcm_port_0
+      - pcm_port_00
+      - pcm_port_01
   outputs:
     server_oam_id:
       description: the oam nova service id
@@ -240,33 +240,42 @@ topology_template:
       cpu_server_oam:
       - server_oam
       - cpu
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       memory_server_oam:
       - server_oam
       - memory
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
       disk.write.requests_server_oam:
       - server_oam
       - disk.write.requests
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       memory.resident_server_oam:
       - server_oam
       - memory.resident
       disk.device.iops_server_oam:
       - server_oam
       - disk.device.iops
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
       disk.device.write.requests_server_oam:
       - server_oam
       - disk.device.write.requests
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.allocation_server_oam:
       - server_oam
       - disk.allocation
@@ -276,12 +285,18 @@ topology_template:
       disk.usage_server_oam:
       - server_oam
       - disk.usage
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
       disk.device.write.bytes_server_oam:
       - server_oam
       - disk.device.write.bytes
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.ephemeral.size_server_oam:
       - server_oam
       - disk.ephemeral.size
@@ -291,18 +306,15 @@ topology_template:
       disk.root.size_server_oam:
       - server_oam
       - disk.root.size
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_oam:
       - server_oam
       - memory.usage
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.bytes_server_oam:
       - server_oam
       - disk.read.bytes
@@ -315,36 +327,18 @@ topology_template:
       disk.capacity_server_oam:
       - server_oam
       - disk.capacity
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
       disk.device.read.bytes_server_oam:
       - server_oam
       - disk.device.read.bytes
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_oam:
       - server_oam
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_oam:
       - server_oam
       - disk.device.read.requests.rate
@@ -375,33 +369,39 @@ topology_template:
       cpu_util_server_oam:
       - server_oam
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       cpu.delta_server_oam:
       - server_oam
       - cpu.delta
       host_server_oam:
       - server_oam
       - host
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_oam:
       - server_oam
       - disk.device.write.bytes.rate
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
       - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_oam:
       - server_oam
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_oam:
       - server_oam
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       disk.latency_server_oam:
       - server_oam
       - disk.latency
@@ -417,31 +417,31 @@ topology_template:
       feature_server_oam:
       - server_oam
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_oam:
       - server_oam
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_oam:
       - server_oam
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_oam:
       - server_oam
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml
index 77d7e26..caf8e40 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/in/nested-oam_v0.1.yaml
@@ -66,10 +66,10 @@ resources:
       flavor: { get_param: oam_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -77,7 +77,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2eeae9a..cf58502 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -577,43 +577,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       oam_server_name:
         type: string
         description: oam server name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_00_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -627,24 +625,20 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_00_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -670,31 +664,37 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -710,8 +710,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -734,27 +734,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -767,37 +767,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory_server_oam:
         type: org.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      disk.write.requests_server_oam:
         type: org.openecomp.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_oam:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -815,154 +813,136 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_oam:
+      network.outgoing.packets.rate_pcm_port_00:
         type: org.openecomp.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_oam:
+      network.incoming.bytes_pcm_port_00:
         type: org.openecomp.capabilities.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_oam:
+      disk.device.write.requests_server_oam:
         type: org.openecomp.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_oam:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_oam:
+      disk.allocation_server_oam:
         type: org.openecomp.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_pcm_port_0:
+      disk.device.usage_server_oam:
         type: org.openecomp.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_oam:
+      disk.usage_server_oam:
         type: org.openecomp.capabilities.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_oam:
+      disk.device.write.bytes_server_oam:
         type: org.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_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_00:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.read.bytes_server_oam:
+      disk.ephemeral.size_server_oam:
         type: org.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_oam:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.requests_server_oam:
+      disk.device.latency_server_oam:
         type: org.openecomp.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_oam:
+      disk.root.size_server_oam:
         type: org.openecomp.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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
+      memory.usage_server_oam:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_port_01:
+        type: org.openecomp.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_pcm_port_0:
+      disk.read.bytes_server_oam:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_oam:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.requests_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_oam:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_oam:
+        type: org.openecomp.capabilities.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_oam:
+      network.incoming.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -973,6 +953,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1032,55 +1018,69 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_oam:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.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_oam:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.packets.rate_pcm_port_01:
+        type: org.openecomp.capabilities.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_oam:
+      network.incoming.packets.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      cpu.delta_server_oam:
         type: org.openecomp.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_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_oam:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_oam:
+      binding_pcm_port_00:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.device.write.bytes.rate_server_oam:
         type: org.openecomp.capabilities.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_oam:
+      network.outgoing.bytes.rate_pcm_port_00:
         type: org.openecomp.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_pcm_port_1:
+      binding_server_oam:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1115,7 +1115,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1127,7 +1127,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1994,4 +1994,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index e49afcd..e33c8f7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -186,17 +186,19 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: oam
-        availabilityzone_name:
-          get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_00_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        availabilityzone_name:
+          get_input: availabilityzone_name
         oam_net_gw:
           get_input: oam_net_gw
+        port_pcm_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         oam_flavor_name:
           get_input: oam_flavor_name
         security_group_name:
@@ -205,29 +207,26 @@ topology_template:
           get_input:
           - cps_net_ips
           - 0
+        port_pcm_port_01_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_server_name:
           get_input:
           - oam_server_names
           - 0
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_pcm_port_00_network_role_tag: cps
         service_template_filter:
           substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_vol:
           get_input:
           - pcm_volumes
           - 0
-        port_pcm_port_1_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_image_name:
           get_input: oam_image_name
         cps_net_name:
@@ -242,6 +241,7 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
+        port_pcm_port_01_network_role_tag: oam
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
@@ -408,4 +408,4 @@ topology_template:
       value:
         get_attribute:
         - server_pcm_002
-        - server_pcm_id
+        - server_pcm_id
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 815fc7c..5abcd8c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_01_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     oam_server_name:
       label: oam server name
       hidden: false
       immutable: false
       type: string
       description: oam server name
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     oam_image_name:
@@ -58,22 +57,19 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
+    port_pcm_port_00_network_role:
+      type: string
+      required: true
+    port_pcm_port_00_ip_requirements:
       type: list
       required: true
       entry_schema:
@@ -102,28 +98,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
+      required: true
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -142,8 +142,8 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
     server_oam:
@@ -158,63 +158,63 @@ topology_template:
         config_drive: true
         name:
           get_input: oam_server_name
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_oam
           relationship: tosca.relationships.network.BindsTo
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -228,8 +228,8 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - server_oam
-      - pcm_port_1
-      - pcm_port_0
+      - pcm_port_00
+      - pcm_port_01
   outputs:
     server_oam_id:
       description: the oam nova service id
@@ -240,33 +240,42 @@ topology_template:
       cpu_server_oam:
       - server_oam
       - cpu
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       memory_server_oam:
       - server_oam
       - memory
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
       disk.write.requests_server_oam:
       - server_oam
       - disk.write.requests
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       memory.resident_server_oam:
       - server_oam
       - memory.resident
       disk.device.iops_server_oam:
       - server_oam
       - disk.device.iops
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
       disk.device.write.requests_server_oam:
       - server_oam
       - disk.device.write.requests
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.allocation_server_oam:
       - server_oam
       - disk.allocation
@@ -276,12 +285,18 @@ topology_template:
       disk.usage_server_oam:
       - server_oam
       - disk.usage
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
       disk.device.write.bytes_server_oam:
       - server_oam
       - disk.device.write.bytes
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.ephemeral.size_server_oam:
       - server_oam
       - disk.ephemeral.size
@@ -291,18 +306,15 @@ topology_template:
       disk.root.size_server_oam:
       - server_oam
       - disk.root.size
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_oam:
       - server_oam
       - memory.usage
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.bytes_server_oam:
       - server_oam
       - disk.read.bytes
@@ -315,36 +327,18 @@ topology_template:
       disk.capacity_server_oam:
       - server_oam
       - disk.capacity
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
       disk.device.read.bytes_server_oam:
       - server_oam
       - disk.device.read.bytes
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_oam:
       - server_oam
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_oam:
       - server_oam
       - disk.device.read.requests.rate
@@ -375,33 +369,39 @@ topology_template:
       cpu_util_server_oam:
       - server_oam
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       cpu.delta_server_oam:
       - server_oam
       - cpu.delta
       host_server_oam:
       - server_oam
       - host
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_oam:
       - server_oam
       - disk.device.write.bytes.rate
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
       - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_oam:
       - server_oam
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_oam:
       - server_oam
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       disk.latency_server_oam:
       - server_oam
       - disk.latency
@@ -417,31 +417,31 @@ topology_template:
       feature_server_oam:
       - server_oam
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_oam:
       - server_oam
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_oam:
       - server_oam
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_oam:
       - server_oam
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml
index 01f8757..3cf1275 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.2.yaml
@@ -57,7 +57,7 @@ parameters:
     description: the name of security group
 
 resources:
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -66,14 +66,14 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_01}
+        - port: { get_resource: pcm_port_11}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
 
-  pcm_port_0:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -81,7 +81,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_11:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -91,4 +91,4 @@ resources:
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml
index 01f8757..53b7b20 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/in/nested-pcm_v0.3.yaml
@@ -57,7 +57,7 @@ parameters:
     description: the name of security group
 
 resources:
-  server_pcm:
+  server_pcm_2:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -66,14 +66,14 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_02}
+        - port: { get_resource: pcm_port_12}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
 
-  pcm_port_0:
+  pcm_port_02:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -81,7 +81,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_12:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -91,4 +91,4 @@ resources:
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_2 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c1c907f..2ebfbde 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,11 +8,7 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      port_pcm_port_11_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -21,30 +17,38 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_11_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_01_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_11_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -58,72 +62,64 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_11_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
         required: true
         status: SUPPORTED
+      port_pcm_port_11_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       cps_net_name:
@@ -141,8 +137,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_11_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
     attributes:
@@ -151,414 +151,414 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_11:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
+      network.outgoing.bytes_pcm_port_11:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      network.incoming.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      cpu_util_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      memory.resident_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_11:
         type: org.openecomp.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_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.allocation_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.write.bytes_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      memory.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      cpu_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      network.incoming.packets.rate_pcm_port_11:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      binding_pcm_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      disk.device.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.incoming.bytes.rate_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
+      attachment_pcm_port_11:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
+      endpoint_server_pcm_1:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      disk.read.bytes.rate_server_pcm_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_pcm:
+      disk.device.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      cpu.delta_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      host_server_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.device.write.requests.rate_server_pcm_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
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.ephemeral.size_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      network.outpoing.packets_pcm_port_11:
         type: org.openecomp.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_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      memory_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.incoming.packets_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
+      disk.device.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      disk.device.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_pcm_port_11:
+        type: org.openecomp.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_pcm_port_0:
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_pcm_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      disk.device.allocation_server_pcm_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:
@@ -567,43 +567,49 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
-        type: string
+      port_pcm_port_02_order:
+        type: integer
         required: true
         status: SUPPORTED
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_12_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_02_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      pcm_image_name:
+      availabilityzone_name:
         type: string
-        description: PCRF CM image name
+        description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
+      port_pcm_port_12_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
+      port_pcm_port_02_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+      pcm_image_name:
         type: string
+        description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_02_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_12_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_02_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -617,29 +623,19 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_12_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
+      port_pcm_port_02_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -655,34 +651,28 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
+      port_pcm_port_12_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
-      pcm_vol:
+      port_pcm_port_12_subnetpoolid:
         type: string
-        description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
-        type: list
+      pcm_vol:
+        type: string
+        description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_02_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       cps_net_name:
@@ -700,424 +690,434 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_12_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_12_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_02_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     attributes:
       server_pcm_id:
         type: string
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_12:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_pcm_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_02:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_server_pcm_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_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_pcm:
+      disk.iops_server_pcm_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_pcm_port_1:
+      network.incoming.packets_pcm_port_02:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_02:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
+      network.outgoing.bytes_pcm_port_12:
         type: org.openecomp.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_pcm:
+      disk.device.write.bytes.rate_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      disk.usage_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pcm:
+      network.incoming.bytes_pcm_port_02:
         type: org.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_pcm:
+      disk.capacity_server_pcm_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_pcm:
+      disk.write.requests_server_pcm_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_pcm:
+      network.incoming.bytes.rate_pcm_port_12:
         type: org.openecomp.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_pcm:
+      disk.read.bytes_server_pcm_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_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_12:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pcm:
+      network.outgoing.packets.rate_pcm_port_02:
         type: org.openecomp.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_pcm:
+      cpu_util_server_pcm_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_pcm:
+      vcpus_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      memory.resident_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_02:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      cpu_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pcm:
-        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_pcm_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.device.write.bytes_server_pcm_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_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.iops_server_pcm_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_pcm:
+      disk.allocation_server_pcm_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.packets.rate_pcm_port_0:
+      network.outgoing.bytes.rate_pcm_port_12:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets.rate_pcm_port_12:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      binding_pcm_port_12:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      memory.usage_server_pcm_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_pcm:
+      disk.device.read.bytes_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_pcm_port_0:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_pcm_port_02:
+        type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_pcm_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      endpoint_server_pcm_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.read.bytes.rate_server_pcm_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
+      attachment_pcm_port_12:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      network.outgoing.packets.rate_pcm_port_12:
         type: org.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_pcm:
+      disk.device.capacity_server_pcm_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_server_pcm:
+      cpu.delta_server_pcm_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_pcm:
+      disk.device.write.requests.rate_server_pcm_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.rate_server_pcm:
+      disk.read.requests_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.ephemeral.size_server_pcm_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_pcm:
-        type: tosca.capabilities.Scalable
+      disk.latency_server_pcm_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_pcm:
+      network.outgoing.bytes.rate_pcm_port_02:
         type: org.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_pcm:
+      network.outpoing.packets_pcm_port_12:
         type: org.openecomp.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_pcm:
+      network.incoming.packets.rate_pcm_port_02:
         type: org.openecomp.capabilities.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_pcm:
+      disk.write.requests.rate_server_pcm_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_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      scalable_server_pcm_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      binding_pcm_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      memory_server_pcm_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_pcm_port_1:
+      disk.device.read.bytes.rate_server_pcm_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_pcm_port_0:
+      disk.device.latency_server_pcm_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
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.packets_pcm_port_12:
+        type: org.openecomp.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_pcm_port_0:
+      disk.device.usage_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.device.write.requests_server_pcm_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_pcm_port_1:
+      disk.write.bytes_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
-        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_pcm_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      instance_server_pcm_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_pcm:
+      disk.device.read.requests_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_pcm_port_12:
+        type: org.openecomp.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_pcm_port_0:
+      network.outpoing.packets_pcm_port_02:
         type: org.openecomp.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_pcm:
+      disk.write.bytes.rate_server_pcm_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      binding_server_pcm_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_pcm_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:
@@ -1681,4 +1681,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
index 976be29..5d4a7a4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
@@ -61,12 +61,12 @@ topology_template:
       properties:
         pcm_flavor_name:
           get_input: pcm_flavor_name
+        port_pcm_port_11_network_role_tag: oam
         service_template_filter:
           substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml
-        port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_11_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
@@ -74,23 +74,23 @@ topology_template:
             is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_11_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
           - 0
+        port_pcm_port_01_network_role_tag: cps
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1
       directives:
@@ -137,34 +137,34 @@ topology_template:
           get_input: pcm_flavor_name
         service_template_filter:
           substitute_service_template: nested-pcm_v0.3ServiceTemplate.yaml
-        port_pcm_port_1_network_role_tag: oam
+        port_pcm_port_12_mac_requirements:
+          mac_count_required:
+            is_required: false
         availabilityzone_name:
           get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_02_mac_requirements:
+          mac_count_required:
+            is_required: false
+        pcm_image_name:
+          get_input: pcm_image_name
+        port_pcm_port_02_network_role_tag: cps
+        pcm_server_name:
+          get_input:
+          - pcm_server_names
+          - 0
+        port_pcm_port_12_network_role_tag: oam
+        port_pcm_port_12_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        pcm_image_name:
-          get_input: pcm_image_name
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_02_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
-        pcm_server_name:
-          get_input:
-          - pcm_server_names
-          - 0
     compute_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -189,4 +189,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - server_pcm_003
-      - compute_port_0
+      - compute_port_0
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 0fbb5e3..57edbcf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,10 +11,7 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
+    port_pcm_port_11_network_role_tag:
       type: string
       required: true
     availabilityzone_name:
@@ -23,27 +20,34 @@ topology_template:
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
+    port_pcm_port_11_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_01_ip_requirements:
+      type: list
       required: true
-    port_pcm_port_0_subnetpoolid:
-      type: string
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_01_vlan_requirements:
+      type: list
       required: true
-    port_pcm_port_1_subnetpoolid:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_11_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,71 +62,64 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_11_network_role:
+      type: string
+      required: true
     security_group_name:
       label: security group name
       hidden: false
       immutable: false
       type: string
       description: the name of security group
+    port_pcm_port_11_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_ip:
       label: CPS network ip
       hidden: false
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_11_order:
+      type: integer
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_11_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     cps_net_name:
       label: CPS network name
@@ -142,85 +139,88 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_11_subnetpoolid:
+      type: string
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_11_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_11_network_role
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_11_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_11_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_11_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_11_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_11_network_role_tag
         network:
           get_input: oam_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_11_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
           get_input: cps_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
+    server_pcm_1:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
   groups:
     nested-pcm_v0.2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -228,221 +228,221 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.2.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
-      - server_pcm
-      - pcm_port_0
+      - pcm_port_11
+      - pcm_port_01
+      - server_pcm_1
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
+      disk.root.size_server_pcm_1:
+      - server_pcm_1
       - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
+      network.outgoing.bytes_pcm_port_11:
+      - pcm_port_11
+      - network.outgoing.bytes
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      disk.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.iops
+      disk.device.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes.rate
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
       - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
+      disk.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
+      disk.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests
+      network.incoming.bytes.rate_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.bytes.rate
+      disk.read.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      feature_pcm_port_11:
+      - pcm_port_11
+      - feature
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
       - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
+      disk.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.usage
+      cpu_util_server_pcm_1:
+      - server_pcm_1
+      - cpu_util
+      vcpus_server_pcm_1:
+      - server_pcm_1
+      - vcpus
+      memory.resident_server_pcm_1:
+      - server_pcm_1
+      - memory.resident
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
+      network.outgoing.packets.rate_pcm_port_11:
+      - pcm_port_11
       - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
+      feature_server_pcm_1:
+      - server_pcm_1
       - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
+      disk.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.allocation
+      disk.device.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes
+      memory.usage_server_pcm_1:
+      - server_pcm_1
+      - memory.usage
+      cpu_server_pcm_1:
+      - server_pcm_1
+      - cpu
+      network.incoming.packets.rate_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.packets.rate
+      binding_pcm_port_11:
+      - pcm_port_11
+      - binding
+      disk.device.read.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pcm_port_11:
+      - pcm_port_11
+      - network.outgoing.bytes.rate
+      attachment_pcm_port_11:
+      - pcm_port_11
       - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      endpoint_server_pcm_1:
+      - server_pcm_1
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
+      disk.device.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.device.iops
+      cpu.delta_server_pcm_1:
+      - server_pcm_1
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
-      - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
+      host_server_pcm_1:
+      - server_pcm_1
+      - host
+      disk.device.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
-      - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
+      disk.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_1:
+      - server_pcm_1
       - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
+      disk.ephemeral.size_server_pcm_1:
+      - server_pcm_1
+      - disk.ephemeral.size
+      disk.latency_server_pcm_1:
+      - server_pcm_1
       - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      network.outpoing.packets_pcm_port_11:
+      - pcm_port_11
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
+      scalable_server_pcm_1:
+      - server_pcm_1
+      - scalable
+      disk.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests.rate
+      memory_server_pcm_1:
+      - server_pcm_1
+      - memory
+      disk.device.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.device.latency
+      disk.device.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes.rate
+      network.incoming.packets_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.packets
+      disk.device.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.device.usage
+      disk.device.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests
+      disk.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.write.bytes
+      disk.device.read.requests_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      instance_server_pcm_1:
+      - server_pcm_1
+      - instance
+      disk.device.read.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests.rate
+      network.incoming.bytes_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.bytes
+      os_server_pcm_1:
+      - server_pcm_1
+      - os
+      binding_server_pcm_1:
+      - server_pcm_1
+      - binding
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
+      disk.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      disk.device.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.device.allocation
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_11:
+      - pcm_port_11
       - dependency
-      dependency_server_pcm:
-      - server_pcm
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
+      dependency_server_pcm_1:
+      - server_pcm_1
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_11:
+      - pcm_port_11
+      - link
+      local_storage_server_pcm_1:
+      - server_pcm_1
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index 86ec008..a938a89 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -11,39 +11,44 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
+    port_pcm_port_02_order:
+      type: integer
       required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
+    port_pcm_port_12_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_02_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
-      type: list
+    port_pcm_port_12_order:
+      type: integer
+      required: true
+    port_pcm_port_02_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_02_network_role_tag:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
-      type: string
+    port_pcm_port_12_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_02_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,26 +63,18 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_12_network_role:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
-      type: list
+    port_pcm_port_02_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -96,33 +93,28 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pcm_port_1_vlan_requirements:
+    port_pcm_port_12_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_12_subnetpoolid:
+      type: string
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_02_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     cps_net_name:
       label: CPS network name
@@ -142,85 +134,93 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_12_network_role_tag:
+      type: string
       required: true
+    port_pcm_port_12_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_02_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
-    pcm_port_1:
+    pcm_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_12_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_12_network_role
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_12_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_12_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_12_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_12_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_12_network_role_tag
         network:
           get_input: oam_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_12_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_2
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
-    pcm_port_0:
+    pcm_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_02_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_02_network_role
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_02_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_02_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_02_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_02_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_02_network_role_tag
         network:
           get_input: cps_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_02_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_2
           relationship: tosca.relationships.network.BindsTo
+    server_pcm_2:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
   groups:
     nested-pcm_v0.3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -228,221 +228,221 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.3.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
-      - server_pcm
-      - pcm_port_0
+      - pcm_port_12
+      - pcm_port_02
+      - server_pcm_2
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_2
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
+      disk.root.size_server_pcm_2:
+      - server_pcm_2
       - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
+      disk.iops_server_pcm_2:
+      - server_pcm_2
+      - disk.iops
+      network.incoming.packets_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.packets
+      feature_pcm_port_02:
+      - pcm_port_02
+      - feature
+      network.outgoing.bytes_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.bytes
+      disk.device.write.bytes.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.bytes.rate
+      disk.usage_server_pcm_2:
+      - server_pcm_2
+      - disk.usage
+      network.incoming.bytes_pcm_port_02:
+      - pcm_port_02
       - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
+      disk.capacity_server_pcm_2:
+      - server_pcm_2
       - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
+      disk.write.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.write.requests
+      network.incoming.bytes.rate_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.bytes.rate
+      disk.read.bytes_server_pcm_2:
+      - server_pcm_2
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
+      attachment_pcm_port_02:
+      - pcm_port_02
+      - attachment
+      feature_pcm_port_12:
+      - pcm_port_12
       - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
+      network.outgoing.packets.rate_pcm_port_02:
+      - pcm_port_02
+      - network.outgoing.packets.rate
+      cpu_util_server_pcm_2:
+      - server_pcm_2
+      - cpu_util
+      vcpus_server_pcm_2:
+      - server_pcm_2
+      - vcpus
+      memory.resident_server_pcm_2:
+      - server_pcm_2
+      - memory.resident
+      network.outgoing.bytes_pcm_port_02:
+      - pcm_port_02
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
+      cpu_server_pcm_2:
+      - server_pcm_2
+      - cpu
+      feature_server_pcm_2:
+      - server_pcm_2
       - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      disk.device.write.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.bytes
+      disk.device.iops_server_pcm_2:
+      - server_pcm_2
+      - disk.device.iops
+      disk.allocation_server_pcm_2:
+      - server_pcm_2
+      - disk.allocation
+      network.outgoing.bytes.rate_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.packets.rate
+      binding_pcm_port_12:
+      - pcm_port_12
+      - binding
+      memory.usage_server_pcm_2:
+      - server_pcm_2
+      - memory.usage
+      disk.device.read.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.device.read.bytes
+      network.incoming.bytes.rate_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.bytes.rate
+      host_server_pcm_2:
+      - server_pcm_2
+      - host
+      endpoint_server_pcm_2:
+      - server_pcm_2
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_2:
+      - server_pcm_2
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
+      attachment_pcm_port_12:
+      - pcm_port_12
+      - attachment
+      network.outgoing.packets.rate_pcm_port_12:
+      - pcm_port_12
+      - network.outgoing.packets.rate
+      disk.device.capacity_server_pcm_2:
+      - server_pcm_2
+      - disk.device.capacity
+      cpu.delta_server_pcm_2:
+      - server_pcm_2
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
+      disk.device.write.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.read.requests
+      disk.ephemeral.size_server_pcm_2:
+      - server_pcm_2
+      - disk.ephemeral.size
+      disk.latency_server_pcm_2:
+      - server_pcm_2
+      - disk.latency
+      network.outgoing.bytes.rate_pcm_port_02:
+      - pcm_port_02
       - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
+      network.outpoing.packets_pcm_port_12:
+      - pcm_port_12
+      - network.outpoing.packets
+      network.incoming.packets.rate_pcm_port_02:
+      - pcm_port_02
+      - network.incoming.packets.rate
+      disk.write.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.write.requests.rate
+      scalable_server_pcm_2:
+      - server_pcm_2
+      - scalable
+      binding_pcm_port_02:
+      - pcm_port_02
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
-      - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
+      memory_server_pcm_2:
+      - server_pcm_2
+      - memory
+      disk.device.read.bytes.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.read.bytes.rate
+      disk.device.latency_server_pcm_2:
+      - server_pcm_2
+      - disk.device.latency
+      network.incoming.packets_pcm_port_12:
+      - pcm_port_12
       - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
+      disk.device.usage_server_pcm_2:
+      - server_pcm_2
+      - disk.device.usage
+      disk.device.write.requests_server_pcm_2:
+      - server_pcm_2
+      - disk.device.write.requests
+      disk.write.bytes_server_pcm_2:
+      - server_pcm_2
+      - disk.write.bytes
+      os_server_pcm_2:
+      - server_pcm_2
+      - os
+      instance_server_pcm_2:
+      - server_pcm_2
       - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
-      - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      disk.device.read.requests_server_pcm_2:
+      - server_pcm_2
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      disk.device.read.requests.rate_server_pcm_2:
+      - server_pcm_2
+      - disk.device.read.requests.rate
+      network.incoming.bytes_pcm_port_12:
+      - pcm_port_12
+      - network.incoming.bytes
+      network.outpoing.packets_pcm_port_02:
+      - pcm_port_02
+      - network.outpoing.packets
+      disk.write.bytes.rate_server_pcm_2:
+      - server_pcm_2
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      binding_server_pcm_2:
+      - server_pcm_2
+      - binding
+      disk.device.allocation_server_pcm_2:
+      - server_pcm_2
+      - disk.device.allocation
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_02:
+      - pcm_port_02
       - dependency
-      dependency_server_pcm:
-      - server_pcm
+      dependency_server_pcm_2:
+      - server_pcm_2
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
+      dependency_pcm_port_12:
+      - pcm_port_12
       - dependency
+      link_pcm_port_12:
+      - pcm_port_12
+      - link
+      link_pcm_port_02:
+      - pcm_port_02
+      - link
+      local_storage_server_pcm_2:
+      - server_pcm_2
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml
index 01f8757..3cf1275 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml
@@ -57,7 +57,7 @@ parameters:
     description: the name of security group
 
 resources:
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -66,14 +66,14 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_01}
+        - port: { get_resource: pcm_port_11}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
 
-  pcm_port_0:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -81,7 +81,7 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_11:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
@@ -91,4 +91,4 @@ resources:
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c1c907f..0c71484 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,11 +8,7 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      port_pcm_port_11_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -21,30 +17,38 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_11_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_01_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_11_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -58,72 +62,64 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_11_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
         required: true
         status: SUPPORTED
+      port_pcm_port_11_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       cps_net_name:
@@ -141,8 +137,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_11_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
     attributes:
@@ -151,414 +151,414 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_11:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
+      network.outgoing.bytes_pcm_port_11:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      network.incoming.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      cpu_util_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      memory.resident_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_11:
         type: org.openecomp.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_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.allocation_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.write.bytes_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      memory.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      cpu_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      network.incoming.packets.rate_pcm_port_11:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      binding_pcm_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      disk.device.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.incoming.bytes.rate_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
+      attachment_pcm_port_11:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
+      endpoint_server_pcm_1:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      disk.read.bytes.rate_server_pcm_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_pcm:
+      disk.device.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      cpu.delta_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      host_server_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.device.write.requests.rate_server_pcm_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
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.ephemeral.size_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      network.outpoing.packets_pcm_port_11:
         type: org.openecomp.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_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      memory_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.incoming.packets_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
+      disk.device.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      disk.device.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_pcm_port_11:
+        type: org.openecomp.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_pcm_port_0:
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_pcm_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      disk.device.allocation_server_pcm_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:
@@ -1126,11 +1126,7 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
+      port_pcm_port_11_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -1139,30 +1135,38 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_11_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_01_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_11_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -1176,72 +1180,64 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       oam_net_gw:
         type: string
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_11_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
         required: true
         status: SUPPORTED
+      port_pcm_port_11_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_ip:
         type: string
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_11_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       cps_net_name:
@@ -1259,8 +1255,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_11_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
     attributes:
@@ -1269,416 +1269,416 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_11:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_pcm:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_01:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_0:
+        - 1
+        - 1
+    - dependency_server_pcm_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
+      disk.root.size_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
+      network.outgoing.bytes_pcm_port_11:
         type: org.openecomp.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_pcm_port_1:
+      network.incoming.packets_pcm_port_01:
         type: org.openecomp.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_pcm_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
+      disk.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      disk.device.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      network.incoming.bytes_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      disk.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
+      disk.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      network.incoming.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_11:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      network.outgoing.packets.rate_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      cpu_util_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
+      vcpus_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_0:
+      memory.resident_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.usage_server_pcm:
+      network.outgoing.packets.rate_pcm_port_11:
         type: org.openecomp.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_pcm:
-        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_pcm_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.allocation_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.write.bytes_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      memory.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_0:
+      cpu_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pcm_port_1:
+      network.incoming.packets.rate_pcm_port_11:
         type: org.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_pcm_port_1:
-        type: tosca.capabilities.Node
+      binding_pcm_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
+      disk.device.read.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      network.incoming.bytes.rate_pcm_port_01:
         type: org.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_pcm_port_0:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_pcm_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_pcm_port_1:
+      attachment_pcm_port_11:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
+      endpoint_server_pcm_1:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      disk.read.bytes.rate_server_pcm_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_pcm:
+      disk.device.iops_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      cpu.delta_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      host_server_pcm_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.device.write.requests.rate_server_pcm_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
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.ephemeral.size_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      network.outpoing.packets_pcm_port_11:
         type: org.openecomp.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_pcm:
+      network.outgoing.bytes.rate_pcm_port_01:
         type: org.openecomp.capabilities.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_pcm:
+      network.incoming.packets.rate_pcm_port_01:
         type: org.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_pcm:
-        type: tosca.capabilities.Container
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      scalable_server_pcm_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.write.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_1:
+      memory_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_0:
+      disk.device.latency_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.bytes.rate_server_pcm_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      network.incoming.packets_pcm_port_11:
         type: org.openecomp.capabilities.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_pcm:
+      disk.device.usage_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
+      disk.device.write.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      disk.write.bytes_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      disk.device.read.requests_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      instance_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      disk.device.read.requests.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_pcm_port_11:
+        type: org.openecomp.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_pcm_port_0:
+      os_server_pcm_1:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_pcm_1:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_port_01:
         type: org.openecomp.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_pcm:
+      disk.write.bytes.rate_server_pcm_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      disk.device.allocation_server_pcm_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
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
index 0c55a9b..8335140 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
@@ -61,12 +61,12 @@ topology_template:
       properties:
         pcm_flavor_name:
           get_input: pcm_flavor_name
+        port_pcm_port_11_network_role_tag: oam
         service_template_filter:
           substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_11_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
@@ -74,23 +74,23 @@ topology_template:
             is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_11_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
           - 0
+        port_pcm_port_01_network_role_tag: cps
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
@@ -98,12 +98,12 @@ topology_template:
       properties:
         pcm_flavor_name:
           get_input: pcm_flavor_name
+        port_pcm_port_11_network_role_tag: oam
         service_template_filter:
           substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
-        port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_11_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
@@ -111,23 +111,23 @@ topology_template:
             is_required: false
         pcm_image_name:
           get_input: pcm_image_name
-        port_pcm_port_1_mac_requirements:
+        port_pcm_port_01_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pcm_port_1_ip_requirements:
+        port_pcm_port_01_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
+        port_pcm_port_11_mac_requirements:
           mac_count_required:
             is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
           - 0
+        port_pcm_port_01_network_role_tag: cps
     server_pcm_003:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2
       directives:
@@ -189,4 +189,4 @@ topology_template:
       - server_pcm_002
       - server_pcm_001
       - server_pcm_003
-      - compute_port_0
+      - compute_port_0
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index d999e22..1e198d3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,10 +11,7 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
+    port_pcm_port_11_network_role_tag:
       type: string
       required: true
     availabilityzone_name:
@@ -23,27 +20,34 @@ topology_template:
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
+    port_pcm_port_11_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
-    port_pcm_port_0_order:
-      type: integer
+    port_pcm_port_01_ip_requirements:
+      type: list
       required: true
-    port_pcm_port_0_subnetpoolid:
-      type: string
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_01_vlan_requirements:
+      type: list
       required: true
-    port_pcm_port_1_subnetpoolid:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_11_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     pcm_server_name:
@@ -58,71 +62,64 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     oam_net_gw:
       label: CPS network gateway
       hidden: false
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_11_network_role:
+      type: string
+      required: true
     security_group_name:
       label: security group name
       hidden: false
       immutable: false
       type: string
       description: the name of security group
+    port_pcm_port_11_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_ip:
       label: CPS network ip
       hidden: false
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_11_order:
+      type: integer
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_11_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
     cps_net_name:
       label: CPS network name
@@ -142,85 +139,88 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_11_subnetpoolid:
+      type: string
       required: true
   node_templates:
-    pcm_port_1:
+    pcm_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_11_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_11_network_role
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_11_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_11_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_11_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_11_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_11_network_role_tag
         network:
           get_input: oam_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_11_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
-    server_pcm:
-      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
           get_input: cps_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_1
           relationship: tosca.relationships.network.BindsTo
+    server_pcm_1:
+      type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
   groups:
     nested-pcm_v0.1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -228,221 +228,221 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - pcm_port_1
-      - server_pcm
-      - pcm_port_0
+      - pcm_port_11
+      - pcm_port_01
+      - server_pcm_1
   outputs:
     server_pcm_id:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
     capabilities:
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      cpu_server_pcm:
-      - server_pcm
-      - cpu
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
-      memory_server_pcm:
-      - server_pcm
-      - memory
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes
-      disk.root.size_server_pcm:
-      - server_pcm
+      disk.root.size_server_pcm_1:
+      - server_pcm_1
       - disk.root.size
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
+      network.outgoing.bytes_pcm_port_11:
+      - pcm_port_11
+      - network.outgoing.bytes
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
+      disk.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.iops
+      disk.device.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes.rate
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
       - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.capacity_server_pcm:
-      - server_pcm
+      disk.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      disk.read.bytes_server_pcm:
-      - server_pcm
+      disk.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests
+      network.incoming.bytes.rate_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.bytes.rate
+      disk.read.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      feature_pcm_port_11:
+      - pcm_port_11
+      - feature
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
       - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
+      disk.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.usage
+      cpu_util_server_pcm_1:
+      - server_pcm_1
+      - cpu_util
+      vcpus_server_pcm_1:
+      - server_pcm_1
+      - vcpus
+      memory.resident_server_pcm_1:
+      - server_pcm_1
+      - memory.resident
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
+      network.outgoing.packets.rate_pcm_port_11:
+      - pcm_port_11
       - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
+      feature_server_pcm_1:
+      - server_pcm_1
       - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
+      disk.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.allocation
+      disk.device.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.bytes
+      memory.usage_server_pcm_1:
+      - server_pcm_1
+      - memory.usage
+      cpu_server_pcm_1:
+      - server_pcm_1
+      - cpu
+      network.incoming.packets.rate_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.packets.rate
+      binding_pcm_port_11:
+      - pcm_port_11
+      - binding
+      disk.device.read.bytes_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
+      network.outgoing.bytes.rate_pcm_port_11:
+      - pcm_port_11
+      - network.outgoing.bytes.rate
+      attachment_pcm_port_11:
+      - pcm_port_11
       - attachment
-      endpoint_server_pcm:
-      - server_pcm
+      endpoint_server_pcm_1:
+      - server_pcm_1
       - endpoint
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
-      - disk.write.bytes
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.read.bytes.rate
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes.rate
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
+      disk.device.iops_server_pcm_1:
+      - server_pcm_1
+      - disk.device.iops
+      cpu.delta_server_pcm_1:
+      - server_pcm_1
       - cpu.delta
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
-      binding_server_pcm:
-      - server_pcm
-      - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
-      disk.device.capacity_server_pcm:
-      - server_pcm
+      host_server_pcm_1:
+      - server_pcm_1
+      - host
+      disk.device.capacity_server_pcm_1:
+      - server_pcm_1
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
-      instance_server_pcm:
-      - server_pcm
-      - instance
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
+      disk.read.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_1:
+      - server_pcm_1
       - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
+      disk.ephemeral.size_server_pcm_1:
+      - server_pcm_1
+      - disk.ephemeral.size
+      disk.latency_server_pcm_1:
+      - server_pcm_1
       - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
+      network.outpoing.packets_pcm_port_11:
+      - pcm_port_11
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
+      scalable_server_pcm_1:
+      - server_pcm_1
+      - scalable
+      disk.write.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.write.requests.rate
+      memory_server_pcm_1:
+      - server_pcm_1
+      - memory
+      disk.device.latency_server_pcm_1:
+      - server_pcm_1
+      - disk.device.latency
+      disk.device.read.bytes.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.bytes.rate
+      network.incoming.packets_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.packets
+      disk.device.usage_server_pcm_1:
+      - server_pcm_1
+      - disk.device.usage
+      disk.device.write.requests_server_pcm_1:
+      - server_pcm_1
+      - disk.device.write.requests
+      disk.write.bytes_server_pcm_1:
+      - server_pcm_1
+      - disk.write.bytes
+      disk.device.read.requests_server_pcm_1:
+      - server_pcm_1
       - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      instance_server_pcm_1:
+      - server_pcm_1
+      - instance
+      disk.device.read.requests.rate_server_pcm_1:
+      - server_pcm_1
+      - disk.device.read.requests.rate
+      network.incoming.bytes_pcm_port_11:
+      - pcm_port_11
+      - network.incoming.bytes
+      os_server_pcm_1:
+      - server_pcm_1
+      - os
+      binding_server_pcm_1:
+      - server_pcm_1
+      - binding
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
+      disk.write.bytes.rate_server_pcm_1:
+      - server_pcm_1
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      disk.device.allocation_server_pcm_1:
+      - server_pcm_1
+      - disk.device.allocation
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_11:
+      - pcm_port_11
       - dependency
-      dependency_server_pcm:
-      - server_pcm
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
+      dependency_server_pcm_1:
+      - server_pcm_1
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_11:
+      - pcm_port_11
+      - link
+      local_storage_server_pcm_1:
+      - server_pcm_1
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 5163613..8512e8a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -70,27 +70,40 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_12:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - link_cmaui_port_11:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_server_cmaui_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -124,39 +137,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_1:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_cmaui_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.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_abc:
         type: org.openecomp.capabilities.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_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:
@@ -168,23 +156,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      os_server_abc:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      cpu_server_abc:
         type: org.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_abc:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_abc:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -202,14 +185,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -228,19 +210,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -251,54 +221,55 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_abc:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.requests_server_abc:
         type: org.openecomp.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_abc:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_abc:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.capacity_server_abc:
         type: org.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.device.write.bytes_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -321,7 +292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -333,221 +304,183 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_abc_port_1:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_abc:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_server_abc:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_12:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
+      feature_cmaui_port_11:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      instance_server_abc:
+      network.outpoing.packets_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_abc_port_1:
+      network.incoming.bytes.rate_cmaui_port_11:
         type: org.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.bytes.rate_cmaui_port_12:
         type: org.openecomp.capabilities.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_abc:
+      network.outgoing.bytes_cmaui_port_11:
         type: org.openecomp.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.outgoing.bytes_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
-        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_abc:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      disk.write.requests.rate_server_abc:
         type: org.openecomp.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.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      instance_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      network.incoming.packets.rate_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      disk.device.write.bytes.rate_server_abc:
         type: org.openecomp.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_abc:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_abc:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_11:
         type: org.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.allocation_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_abc_port_1:
+      network.outpoing.packets_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.device.iops_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_12:
         type: org.openecomp.capabilities.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.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.incoming.packets_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -557,27 +490,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.device.latency_server_abc:
         type: org.openecomp.capabilities.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_abc:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 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_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -587,9 +519,8 @@ 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_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
@@ -599,11 +530,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -616,7 +542,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -633,7 +559,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_12:
+        type: org.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_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:
@@ -645,6 +583,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -704,7 +649,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -716,53 +661,55 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_12:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.write.requests.rate_server_abc:
         type: org.openecomp.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.outgoing.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.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_abc:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.read.requests_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -777,20 +724,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      disk.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_12:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_11:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -806,6 +770,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_cmaui_port_12:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_12:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_11:
+        type: org.openecomp.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_abc:
         type: tosca.capabilities.Node
         occurrences:
@@ -860,336 +860,336 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_21:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_cmaui_port_1:
+        - 1
+        - 1
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
+        - 0
+        - UNBOUNDED
     capabilities:
-      cpu.delta_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.device.write.requests.rate_server_cmaui:
+      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
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      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.read.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      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
-      cpu_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:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.packets.rate_cmaui_port_21:
+        type: org.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:
+      network.outgoing.packets.rate_cmaui_port_21:
         type: org.openecomp.capabilities.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:
+      binding_cmaui_port_21:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_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.capacity_server_cmaui:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      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.usage_server_cmaui:
+      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
-      network.outgoing.bytes_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_21:
         type: org.openecomp.capabilities.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:
+      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
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         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.
+      feature_cmaui_port_21:
+        type: tosca.capabilities.Node
         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:
+      network.incoming.bytes.rate_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.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.root.size_server_cmaui:
+      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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      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.read.requests.rate_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      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
-      network.incoming.packets_cmaui_port_1:
+      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
-      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.
+      attachment_cmaui_port_21:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.incoming.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      vcpus_server_cmaui:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.incoming.packets_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      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
-      disk.allocation_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_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
-      memory.usage_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      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
-      network.outpoing.packets_cmaui_port_1:
+      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.outgoing.bytes.rate_cmaui_port_1:
+      network.outgoing.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      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
-      disk.read.bytes_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
-      network.incoming.bytes_cmaui_port_1:
+      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:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index 4f0f52d..aa6da4f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -204,7 +204,7 @@ topology_template:
         service_template_filter:
           substitute_service_template: nested2ServiceTemplate.yaml
       requirements:
-      - link_cmaui_port_1:
+      - link_cmaui_port_21:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
@@ -220,17 +220,17 @@ topology_template:
         p2:
           get_input: shared_network_id2
       requirements:
-      - link_cmaui_port_2:
+      - link_cmaui_port_12:
           capability: tosca.capabilities.network.Linkable
           node: test_net2
           relationship: tosca.relationships.network.LinksTo
-      - link_abc_port_1:
+      - link_cmaui_port_11:
           capability: tosca.capabilities.network.Linkable
-          node: test_net2
+          node: test_net1
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1:
+      - link_abc_port_1:
           capability: tosca.capabilities.network.Linkable
-          node: test_net1
+          node: test_net2
           relationship: tosca.relationships.network.LinksTo
     test_net1:
       type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
@@ -275,17 +275,17 @@ topology_template:
         p2:
           get_input: shared_network_id2
       requirements:
-      - link_cmaui_port_2:
+      - link_cmaui_port_12:
           capability: tosca.capabilities.network.Linkable
           node: test_net2
           relationship: tosca.relationships.network.LinksTo
-      - link_abc_port_1:
+      - link_cmaui_port_11:
           capability: tosca.capabilities.network.Linkable
-          node: test_net2
+          node: test_net1
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1:
+      - link_abc_port_1:
           capability: tosca.capabilities.network.Linkable
-          node: test_net1
+          node: test_net2
           relationship: tosca.relationships.network.LinksTo
   groups:
     main_group:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index 15e6359..ca42519 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -76,7 +76,7 @@ topology_template:
       type: string
       description: Image for CMAUI server
   node_templates:
-    cmaui_port_2:
+    cmaui_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -101,9 +101,36 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    cmaui_port_11:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        replacement_policy: AUTO
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        security_groups:
+        - get_input: security_group_name
+        fixed_ips:
+        - ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 0
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        network:
+          get_input: p1
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_cmaui_1
+          relationship: tosca.relationships.network.BindsTo
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -156,33 +183,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: server_abc
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        replacement_policy: AUTO
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        security_groups:
-        - get_input: security_group_name
-        fixed_ips:
-        - ip_address:
-            get_input:
-            - cmaui_oam_ips
-            - 0
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: p1
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -190,98 +190,83 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: cmaui server template for vMMSC
       members:
-      - cmaui_port_2
-      - server_cmaui
+      - cmaui_port_12
+      - cmaui_port_11
+      - server_cmaui_1
       - server_abc
       - abc_port_1
-      - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
       disk.write.bytes.rate_server_abc:
       - server_abc
       - disk.write.bytes.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
       memory.resident_server_abc:
       - server_abc
       - memory.resident
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
       os_server_abc:
       - server_abc
       - os
       cpu_server_abc:
       - server_abc
       - cpu
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
       network.outgoing.packets.rate_abc_port_1:
       - abc_port_1
       - network.outgoing.packets.rate
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
       binding_abc_port_1:
       - abc_port_1
       - binding
       disk.device.write.requests_server_abc:
       - server_abc
       - disk.device.write.requests
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       feature_abc_port_1:
       - abc_port_1
       - feature
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
       disk.write.requests_server_abc:
       - server_abc
       - disk.write.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
       - disk.device.read.bytes
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       disk.capacity_server_abc:
       - server_abc
       - disk.capacity
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
       disk.device.write.bytes_server_abc:
       - server_abc
       - disk.device.write.bytes
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
       disk.device.read.bytes.rate_server_abc:
       - server_abc
       - disk.device.read.bytes.rate
@@ -291,171 +276,159 @@ topology_template:
       attachment_abc_port_1:
       - abc_port_1
       - attachment
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
       disk.read.bytes_server_abc:
       - server_abc
       - disk.read.bytes
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      feature_cmaui_port_12:
+      - cmaui_port_12
+      - feature
+      feature_cmaui_port_11:
+      - cmaui_port_11
+      - feature
       network.outpoing.packets_abc_port_1:
       - abc_port_1
       - network.outpoing.packets
+      network.incoming.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.bytes
       endpoint_server_abc:
       - server_abc
       - endpoint
       disk.write.requests.rate_server_abc:
       - server_abc
       - disk.write.requests.rate
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
       instance_server_abc:
       - server_abc
       - instance
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
       network.incoming.packets.rate_abc_port_1:
       - abc_port_1
       - network.incoming.packets.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
       disk.device.write.bytes.rate_server_abc:
       - server_abc
       - disk.device.write.bytes.rate
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
+      network.incoming.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets.rate
       disk.allocation_server_abc:
       - server_abc
       - disk.allocation
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      network.outpoing.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.outpoing.packets
       disk.device.iops_server_abc:
       - server_abc
       - disk.device.iops
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      network.outpoing.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.outpoing.packets
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
       - feature
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
       network.incoming.packets_abc_port_1:
       - abc_port_1
       - network.incoming.packets
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      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
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
       disk.root.size_server_abc:
       - server_abc
       - disk.root.size
-      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_1:
+      - server_cmaui_1
+      - disk.write.requests
       disk.device.latency_server_abc:
       - server_abc
       - disk.device.latency
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       memory_server_abc:
       - server_abc
       - memory
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
       disk.device.read.bytes_server_abc:
       - server_abc
       - disk.device.read.bytes
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
       memory.usage_server_abc:
       - server_abc
       - memory.usage
       disk.read.requests_server_abc:
       - server_abc
       - disk.read.requests
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       disk.usage_server_abc:
       - server_abc
       - disk.usage
       scalable_server_abc:
       - server_abc
       - scalable
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.bytes.rate
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
       disk.write.bytes_server_abc:
       - server_abc
       - disk.write.bytes
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       disk.read.bytes.rate_server_abc:
       - server_abc
       - disk.read.bytes.rate
@@ -486,57 +459,84 @@ topology_template:
       network.incoming.bytes_abc_port_1:
       - abc_port_1
       - network.incoming.bytes
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
       disk.device.allocation_server_abc:
       - server_abc
       - disk.device.allocation
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
+      network.outgoing.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.packets.rate
+      binding_cmaui_port_12:
+      - cmaui_port_12
+      - binding
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
       - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
       disk.device.write.requests.rate_server_abc:
       - server_abc
       - disk.device.write.requests.rate
+      network.outgoing.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.packets.rate
+      binding_cmaui_port_11:
+      - cmaui_port_11
+      - binding
       disk.device.read.requests_server_abc:
       - server_abc
       - disk.device.read.requests
       host_server_abc:
       - server_abc
       - host
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      attachment_cmaui_port_12:
+      - cmaui_port_12
+      - attachment
+      attachment_cmaui_port_11:
+      - cmaui_port_11
+      - attachment
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
       cpu.delta_server_abc:
       - server_abc
       - cpu.delta
       disk.latency_server_abc:
       - server_abc
       - disk.latency
+      network.incoming.bytes_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.bytes
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
       feature_server_abc:
       - server_abc
       - feature
@@ -550,27 +550,27 @@ topology_template:
       dependency_server_abc:
       - server_abc
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
+      link_cmaui_port_11:
+      - cmaui_port_11
+      - link
+      dependency_cmaui_port_11:
+      - cmaui_port_11
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      dependency_cmaui_port_12:
+      - cmaui_port_12
       - dependency
+      link_cmaui_port_12:
+      - cmaui_port_12
+      - link
       link_abc_port_1:
       - abc_port_1
       - link
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_server_cmaui_1:
+      - server_cmaui_1
       - dependency
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
       local_storage_server_abc:
       - server_abc
       - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
index 1d2d9ad..33bcd18 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -52,20 +52,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
-    cmaui_port_1:
+    cmaui_port_21:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -90,8 +77,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -99,177 +99,177 @@ topology_template:
         heat_file: ../Artifacts/nested2.yml
         description: cmaui server template for vMMSC
       members:
-      - server_cmaui
-      - cmaui_port_1
+      - cmaui_port_21
+      - server_cmaui_2
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.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
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
       - 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.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
-      disk.device.usage_server_cmaui:
-      - server_cmaui
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.usage
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      memory_server_cmaui:
-      - server_cmaui
-      - 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_server_cmaui_2:
+      - server_cmaui_2
       - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
+      feature_server_cmaui_2:
+      - server_cmaui_2
       - feature
-      binding_cmaui_port_1:
-      - cmaui_port_1
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      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
+      network.incoming.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets.rate
+      network.outgoing.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.packets.rate
+      binding_cmaui_port_21:
+      - cmaui_port_21
       - binding
-      vcpus_server_cmaui:
-      - server_cmaui
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
       - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
       - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      network.outpoing.packets_cmaui_port_21:
+      - cmaui_port_21
       - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      endpoint_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
       - 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_server_cmaui_2:
+      - server_cmaui_2
       - disk.read.bytes
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      feature_cmaui_port_21:
+      - cmaui_port_21
+      - feature
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes
+      network.incoming.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes.rate
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      network.outgoing.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      attachment_cmaui_port_21:
+      - cmaui_port_21
+      - attachment
+      network.incoming.bytes_cmaui_port_21:
+      - cmaui_port_21
       - network.incoming.bytes
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      network.incoming.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
+      network.outgoing.bytes_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_cmaui_port_21:
+      - cmaui_port_21
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
+      link_cmaui_port_21:
+      - cmaui_port_21
+      - link
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
       - local_storage
-      dependency_cmaui_port_1:
-      - cmaui_port_1
-      - dependency
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
\ No newline at end of file
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml
index 66a15d0..7efee25 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml
@@ -40,7 +40,7 @@ parameters:
     type: string
 resources:
 
-  cmaui_port_1:
+  cmaui_port_11:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_12:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -64,7 +64,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -72,8 +72,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_port_11 }
+      - port: { get_resource: cmaui_port_12 }
 
   server_abc:
     type: OS::Nova::Server

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml
index b09d3af..12e1b21 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml
@@ -29,7 +29,7 @@ parameters:
 
 resources:
 
-  cmaui_port_1:
+  cmaui_port_21:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -37,7 +37,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -45,4 +45,4 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
\ No newline at end of file
+      - port: { get_resource: cmaui_port_21 }
\ 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 0e22fb2..24aae93 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -52,14 +52,27 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - link_cmaui_port_10:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_server_cmaui_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -73,1593 +86,1580 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested2Level:
+    - dependency_cmaui_port_21_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested2Level:
+    - link_cmaui_port_21_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - binding_cmaui_port_2_test_nested2Level:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_2_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_22_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_22_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested4Level_test_nested3Level_test_nested2Level:
+    - binding_cmaui_port_22_test_nested2Level:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_cmaui_port_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_cmaui_port_43_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:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested3Level_test_nested2Level:
+        - 1
+        - 1
+    - dependency_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_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
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_cmaui_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_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_cmaui_port_1_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_cmaui_port_0:
+    - dependency_cmaui_port_33_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_0:
+    - link_cmaui_port_33_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      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:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      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.allocation_server_cmaui:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_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_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_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
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1_test_nested2Level:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_42_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
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.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.outgoing.bytes_cmaui_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level_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.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_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
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.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.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
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_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
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_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
-      cpu_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      network.outpoing.packets_cmaui_port_42_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_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
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      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
-      instance_server_cmaui_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
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      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
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_22_test_nested2Level:
         type: org.openecomp.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_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_43_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:
+      feature_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_43_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:
+      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
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_0:
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes_cmaui_port_21_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_10:
         type: org.openecomp.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_cmaui_port_21_test_nested2Level:
         type: org.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.write.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_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.
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_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:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      binding_cmaui_port_33_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.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
-      network.incoming.packets_cmaui_port_3_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.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_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:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1_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
-      network.outpoing.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_0:
+      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
-      cpu_server_cmaui:
+      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.device.read.bytes.rate_server_cmaui:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_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.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_0:
-        type: tosca.capabilities.Node
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_43_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:
+      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
-      disk.usage_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.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.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.rate_server_cmaui:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_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.incoming.bytes.rate_cmaui_port_3_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
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_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
-      network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.requests.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
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.device.capacity_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      disk.device.read.requests.rate_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
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_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
-      disk.write.bytes_server_cmaui:
+      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
-      endpoint_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      attachment_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_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
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_10:
         type: org.openecomp.capabilities.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:
+      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.incoming.bytes_cmaui_port_2_test_nested4Level_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
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_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
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      network.outgoing.bytes_cmaui_port_22_test_nested2Level:
+        type: org.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.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.device.write.bytes_server_cmaui:
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested2Level:
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      memory_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_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
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_0:
+      network.incoming.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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:
+      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.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_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.allocation_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.device.iops_server_cmaui_test_nested2Level:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_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.write.requests_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      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.read.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.usage_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
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      network.incoming.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.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_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.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1_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.delta_server_cmaui_test_nested4Level_test_nested3Level_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.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      binding_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      feature_cmaui_port_10:
+        type: tosca.capabilities.Node
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2_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.
+      attachment_cmaui_port_22_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_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
-      disk.device.write.bytes.rate_server_cmaui_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
-      attachment_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.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
-      disk.device.read.bytes_server_cmaui:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_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
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.incoming.bytes_cmaui_port_43_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_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.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:
+      network.outpoing.packets_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_42_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_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_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_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:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_0:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested2Level:
+      network.outpoing.packets_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
+      binding_cmaui_port_22_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.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.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
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
+      binding_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         valid_source_types:
-        - tosca.nodes.SoftwareComponent
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_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
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.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.
+      attachment_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_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.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_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:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_test_nested2Level:
+      binding_cmaui_port_32_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.outgoing.bytes.rate_cmaui_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      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:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_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
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      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
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_42_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_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_22_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_0:
+      network.outgoing.bytes.rate_cmaui_port_42_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.capacity_server_cmaui:
+      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
-      attachment_cmaui_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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.
+      attachment_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_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_server_cmaui:
+      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
-      scalable_server_cmaui_test_nested2Level:
+      scalable_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_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.
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      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.device.capacity_server_cmaui_test_nested4Level_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
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.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:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      network.incoming.bytes_cmaui_port_42_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:
+      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.read.bytes.rate_server_cmaui_test_nested2Level:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      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.allocation_server_cmaui_test_nested2Level:
+      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:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_0:
+      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.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested3Level_test_nested2Level:
+      binding_cmaui_port_10:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_42_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_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.bytes_cmaui_port_10:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.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
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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:
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1712,1268 +1712,1268 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_21:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - binding_cmaui_port_2:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3Level:
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested3Level:
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_22:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested3Level:
+    - link_cmaui_port_22:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested4Level_test_nested3Level:
+    - binding_cmaui_port_22:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level_test_nested3Level:
+    - dependency_cmaui_port_32_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level_test_nested3Level:
+    - link_cmaui_port_32_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level_test_nested3Level:
+    - dependency_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level_test_nested3Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_cmaui_port_43_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:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_43_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested3Level:
+        - 1
+        - 1
+    - dependency_cmaui_port_42_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested3Level:
+    - link_cmaui_port_42_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_nested3Level:
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_cmaui:
+    - 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:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_cmaui_port_33_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_1:
+    - link_cmaui_port_33_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      network.outpoing.packets_cmaui_port_43_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_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
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_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
-      network.outgoing.bytes.rate_cmaui_port_2_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
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_21:
         type: org.openecomp.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:
+      network.outgoing.bytes.rate_cmaui_port_42_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
+      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
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_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
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level:
+      feature_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_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
-      network.outgoing.bytes_cmaui_port_1:
+      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
-      instance_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.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      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
-      feature_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_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:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.Node
+      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
-      instance_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_22:
         type: org.openecomp.capabilities.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.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
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.Node
+      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
-      network.outgoing.packets.rate_cmaui_port_2_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
-      network.incoming.packets_cmaui_port_2_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.allocation_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_43_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_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      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
-      disk.write.requests.rate_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
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level:
+      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
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.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.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_42_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_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.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:
+      binding_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.device.read.requests_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
-      disk.write.requests_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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      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
-      binding_cmaui_port_1:
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_42_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_server_cmaui_test_nested4Level_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
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      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
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_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.iops_server_cmaui:
+      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.bytes_cmaui_port_2:
+      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.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_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
-      network.incoming.bytes_cmaui_port_1:
+      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.root.size_server_cmaui_test_nested3Level:
+      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
-      cpu_server_cmaui_test_nested4Level_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.incoming.bytes.rate_cmaui_port_2_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
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_22:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_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
-      feature_cmaui_port_1:
+      feature_server_cmaui_2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      disk.allocation_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_21:
         type: org.openecomp.capabilities.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:
+      binding_cmaui_port_21:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_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
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      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.write.requests.rate_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.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_42_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.iops_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.
+      attachment_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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.device.latency_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.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      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.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.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.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      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
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_22:
         type: org.openecomp.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.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.usage_server_cmaui:
+      network.outpoing.packets_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_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.allocation_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
-      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.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      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
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_cmaui_port_22:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      feature_cmaui_port_21:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_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
-      memory_server_cmaui:
+      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
-      network.incoming.bytes.rate_cmaui_port_2_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.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_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.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.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.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_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.write.bytes_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
+        type: org.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:
-        type: tosca.capabilities.Scalable
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_21:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_43_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_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_22:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.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.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cmaui_port_42_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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.packets_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      network.incoming.bytes_cmaui_port_22:
         type: org.openecomp.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_42_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:
+      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
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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.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
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level:
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu_util_server_cmaui_test_nested4Level_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
-      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
-      network.incoming.bytes_cmaui_port_3_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
-      cpu_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
-      disk.usage_server_cmaui_test_nested3Level:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      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
-      network.outpoing.packets_cmaui_port_2:
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.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
-      attachment_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_42_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_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:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2_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
-      disk.read.requests_server_cmaui_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
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3029,14 +3029,14 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_3:
+    - dependency_cmaui_port_32:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3:
+    - link_cmaui_port_32:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3049,820 +3049,820 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level:
+    - dependency_cmaui_port_43_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level:
+    - link_cmaui_port_43_test_nested4Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level:
+    - dependency_cmaui_port_42_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level:
+    - link_cmaui_port_42_test_nested4Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         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
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_2:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_3:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_33:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_33:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     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
-      binding_cmaui_port_2_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 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
-      network.incoming.bytes_cmaui_port_2_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:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_33:
         type: org.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
+      network.incoming.bytes.rate_cmaui_port_32:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.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
-      instance_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
-      disk.root.size_server_cmaui_test_nested4Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.read.requests_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_43_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_util_server_cmaui:
+      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
-      feature_cmaui_port_2_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_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.usage_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.
+      binding_cmaui_port_43_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_4_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3:
+      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
-      network.incoming.bytes_cmaui_port_3_test_nested4Level:
+      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
-      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.
+      attachment_cmaui_port_32:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43_test_nested4Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level:
+      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
-      attachment_cmaui_port_2_test_nested4Level:
+      attachment_cmaui_port_33:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_42_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:
+      network.incoming.packets.rate_cmaui_port_33:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets.rate_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.device.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
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_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
-      attachment_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.Attachment
+      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
-      network.incoming.packets_cmaui_port_3:
+      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
-      network.incoming.packets_cmaui_port_2:
+      disk.device.read.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      binding_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      feature_cmaui_port_43_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      memory_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.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.
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2_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.write.requests.rate_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
-      disk.device.iops_server_cmaui_test_nested4Level:
+      network.incoming.bytes_cmaui_port_42_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:
+      disk.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      network.outpoing.packets_cmaui_port_42_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
+      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
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      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
-      disk.ephemeral.size_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2:
+      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
-      network.outgoing.bytes.rate_cmaui_port_3:
+      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
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3:
+      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
-      network.outgoing.packets.rate_cmaui_port_3_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.iops_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      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.capacity_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_33:
         type: org.openecomp.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:
+      network.incoming.packets_cmaui_port_42_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_42_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
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_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.device.read.bytes.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.device.allocation_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      network.outgoing.packets.rate_cmaui_port_43_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_cmaui_port_2:
+      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
-      cpu_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
-      network.incoming.packets.rate_cmaui_port_3:
+      network.outgoing.bytes_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
+      feature_cmaui_port_33:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
+      feature_cmaui_port_32:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_43_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.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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.device.read.bytes.rate_server_cmaui:
+      network.outgoing.bytes_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      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
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_32:
         type: org.openecomp.capabilities.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_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      disk.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      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.outgoing.packets.rate_cmaui_port_3:
+      network.outgoing.packets.rate_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_33:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      endpoint_server_cmaui_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      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
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_43_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_cmaui_port_3_test_nested4Level:
+      network.incoming.packets_cmaui_port_43_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.iops_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_32:
         type: org.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
+      binding_cmaui_port_32:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      memory_server_cmaui:
+      network.incoming.bytes_cmaui_port_32:
         type: org.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.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:
+      network.incoming.packets_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level:
+      network.incoming.packets_cmaui_port_33:
         type: org.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.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.read.requests.rate_server_cmaui:
+      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.write.bytes_server_cmaui:
+      network.incoming.bytes_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      network.outpoing.packets_cmaui_port_33:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level:
+      network.outpoing.packets_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.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
-      memory.usage_server_cmaui_test_nested4Level:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_42_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_cmaui_port_2_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_43_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.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
-      network.incoming.packets_cmaui_port_2_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_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
-      network.incoming.bytes.rate_cmaui_port_2:
+      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
-      network.incoming.bytes.rate_cmaui_port_3:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_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
-      cpu_util_server_cmaui_test_nested4Level:
+      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.allocation_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_43_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:
+      network.incoming.bytes_cmaui_port_43_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_cmaui_port_2:
+      network.outgoing.bytes_cmaui_port_42_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_cmaui_port_3:
+      disk.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3912,40 +3912,40 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_3:
+    - dependency_cmaui_port_43:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3:
+    - link_cmaui_port_43:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_42:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_42:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         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
@@ -3953,373 +3953,373 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      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.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
-      network.incoming.packets.rate_cmaui_port_2:
+      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
-      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.
+      feature_cmaui_port_42:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_42:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
-        type: tosca.capabilities.Node
+      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.write.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
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      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
-      network.outgoing.bytes_cmaui_port_3:
+      network.incoming.bytes_cmaui_port_43:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets_cmaui_port_42:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets_cmaui_port_43:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.incoming.bytes_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      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.usage_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
-      network.outgoing.packets.rate_cmaui_port_3:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_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.requests_server_cmaui:
+      network.outgoing.bytes_cmaui_port_42:
         type: org.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:
+      network.outgoing.bytes_cmaui_port_43:
         type: org.openecomp.capabilities.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
-      network.incoming.packets_cmaui_port_3:
+      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
-      network.incoming.packets_cmaui_port_2:
+      cpu_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_43:
         type: org.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.packets.rate_cmaui_port_43:
         type: org.openecomp.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:
+      binding_cmaui_port_43:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_42:
         type: org.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.packets.rate_cmaui_port_42:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2:
+      binding_cmaui_port_42:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      vcpus_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:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      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.incoming.bytes.rate_cmaui_port_3:
+      network.outpoing.packets_cmaui_port_43:
         type: org.openecomp.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:
+      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.outpoing.packets_cmaui_port_42:
         type: org.openecomp.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.outpoing.packets_cmaui_port_2:
+      feature_cmaui_port_43:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.outpoing.packets_cmaui_port_3:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      network.incoming.bytes.rate_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      network.incoming.bytes.rate_cmaui_port_43:
         type: org.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:
+      network.outgoing.bytes.rate_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3:
+      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:
+      network.outgoing.bytes.rate_cmaui_port_43:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index f769955..5668311 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -47,31 +47,31 @@ topology_template:
           - test_contrailV2_net
           - fq_name
       requirements:
-      - link_cmaui_port_2_test_nested2Level:
+      - link_cmaui_port_10:
           capability: tosca.capabilities.network.Linkable
-          node: test_contrailV2_net
+          node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_21_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_22_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
-          node: test_net
+          node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_32_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1_test_nested2Level:
+      - link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_0:
+      - link_cmaui_port_33_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
@@ -96,11 +96,11 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_cmaui_port_3_test_nested4Level:
+      - link_cmaui_port_32:
           capability: tosca.capabilities.network.Linkable
           node: test_contrail_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2:
+      - link_cmaui_port_43_test_nested4Level:
           capability: tosca.capabilities.network.Linkable
           node: test_contrail_net
           relationship: tosca.relationships.network.LinksTo

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 06a7839..a93950d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -56,31 +56,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
-    test_nested2Level:
-      type: org.openecomp.resource.abstract.nodes.heat.nested2
-      directives:
-      - substitutable
-      properties:
-        p1:
-          get_input: p1
-        service_template_filter:
-          substitute_service_template: nested2ServiceTemplate.yaml
-        p2:
-          get_input: p2
-    cmaui_port_0:
+    cmaui_port_10:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -105,8 +81,32 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
+    test_nested2Level:
+      type: org.openecomp.resource.abstract.nodes.heat.nested2
+      directives:
+      - substitutable
+      properties:
+        p1:
+          get_input: p1
+        service_template_filter:
+          substitute_service_template: nested2ServiceTemplate.yaml
+        p2:
+          get_input: p2
   groups:
     nested1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -114,820 +114,820 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: nested1
       members:
-      - server_cmaui
+      - cmaui_port_10
+      - server_cmaui_1
       - test_nested2Level
-      - cmaui_port_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_3_test_nested3Level
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_2_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_2
-      network.incoming.bytes_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_33_test_nested3Level
+      feature_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_cmaui_port_32_test_nested3Level
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.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.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes_cmaui_port_1_test_nested2Level:
+      - scalable_server_cmaui_3_test_nested3Level
+      network.incoming.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_1
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_22
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      network.incoming.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_32_test_nested3Level
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
-      network.outgoing.bytes_cmaui_port_0:
-      - cmaui_port_0
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.latency_server_cmaui_3_test_nested3Level
+      network.incoming.packets_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_21
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
+      network.outpoing.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_32_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_3_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
-      - network.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_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.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_2
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_2
+      feature_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_cmaui_port_33_test_nested3Level
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui_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.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
+      - network.incoming.packets_cmaui_port_22
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_3_test_nested3Level
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      feature_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - feature
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      network.incoming.bytes_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_3_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_42_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_21
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
+      network.incoming.packets.rate_cmaui_port_10:
+      - cmaui_port_10
+      - network.incoming.packets.rate
+      network.incoming.bytes.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      binding_cmaui_port_0:
-      - cmaui_port_0
-      - binding
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_21
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
-      feature_test_nested2Level:
+      - feature_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
+      network.outpoing.packets_cmaui_port_10:
+      - cmaui_port_10
+      - network.outpoing.packets
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_2
+      binding_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_33_test_nested3Level
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level_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
-      - network.outgoing.bytes_cmaui_port_3_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes_cmaui_port_0:
-      - cmaui_port_0
-      - network.incoming.bytes
-      network.incoming.bytes.rate_cmaui_port_1_test_nested2Level:
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_1
-      network.outpoing.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_2
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_3_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui
-      network.incoming.packets.rate_cmaui_port_0:
-      - cmaui_port_0
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      - feature_cmaui_port_21
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      feature_cmaui_port_0:
-      - cmaui_port_0
-      - feature
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
+      - disk.usage_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_1
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_2
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_3_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
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested3Level
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_32_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_2
-      binding_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      - os_server_cmaui_2
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      feature_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_2_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_2
+      network.outgoing.bytes.rate_cmaui_port_10:
+      - cmaui_port_10
+      - network.outgoing.bytes.rate
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_3_test_nested3Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
+      attachment_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_33_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_22
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
+      network.incoming.packets_cmaui_port_10:
+      - cmaui_port_10
+      - network.incoming.packets
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_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
-      - network.incoming.packets.rate_cmaui_port_2_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_util_server_cmaui_2
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      network.outgoing.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_22
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_2_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2
-      memory_server_cmaui_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
-      - memory_server_cmaui
-      network.outgoing.bytes_cmaui_port_1_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_1
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_21
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.outpoing.packets_cmaui_port_0:
-      - cmaui_port_0
-      - network.outpoing.packets
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_21
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_33_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_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.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_1
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      - attachment_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2
-      disk.write.requests_server_cmaui_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_22
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_21
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_1_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_1
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_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:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level:
+      - disk.allocation_server_cmaui_2
+      network.incoming.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_32_test_nested3Level
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_3_test_nested4Level_test_nested3Level
-      binding_cmaui_port_1_test_nested2Level:
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_1
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      network.outgoing.bytes.rate_cmaui_port_3_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
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_cmaui_port_10:
+      - cmaui_port_10
+      - network.outgoing.bytes
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_cmaui_port_10:
+      - cmaui_port_10
+      - feature
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui
-      attachment_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_10:
+      - cmaui_port_10
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_2_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_33_test_nested3Level
+      attachment_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_22
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes.rate_server_cmaui_2
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      attachment_cmaui_port_1_test_nested2Level:
+      - feature_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_1
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_2
+      cpu.delta_server_cmaui_4_test_nested4Level_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:
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_cmaui_port_42_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_32_test_nested3Level
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_1
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
-      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:
+      - network.incoming.packets.rate_cmaui_port_32_test_nested3Level
+      network.outpoing.packets_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.packets_cmaui_port_0:
-      - cmaui_port_0
-      - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_21
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      attachment_cmaui_port_2_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_2
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
-      feature_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_43_test_nested4Level_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_3_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_22
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      network.outpoing.packets_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_22
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      feature_cmaui_port_2_test_nested2Level:
+      - binding_cmaui_port_22
+      instance_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_2
+      network.outgoing.bytes.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_21
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_21
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_33_test_nested3Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.iops_server_cmaui_test_nested2Level:
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      attachment_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui
-      binding_cmaui_port_2_test_nested2Level:
+      - attachment_cmaui_port_21
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2
-      network.outgoing.bytes.rate_cmaui_port_0:
-      - cmaui_port_0
-      - network.outgoing.bytes.rate
-      memory.usage_server_cmaui_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_32_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_2
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_0:
-      - cmaui_port_0
-      - network.outgoing.packets.rate
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      attachment_cmaui_port_0:
-      - cmaui_port_0
-      - attachment
-      network.outpoing.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_2
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.capacity_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.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - binding_server_cmaui_2
+      feature_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - feature_cmaui_port_22
+      network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      cpu.delta_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_3_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu.delta_server_cmaui_2
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      attachment_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_32_test_nested3Level
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_3_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
-      network.incoming.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_3_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
-      attachment_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_3_test_nested3Level
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_32_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_33_test_nested3Level
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_0:
-      - cmaui_port_0
-      - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      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
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
-      binding_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_3_test_nested3Level
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
+      attachment_cmaui_port_10:
+      - cmaui_port_10
+      - attachment
+      network.outgoing.packets.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested3Level
-      feature_cmaui_port_1_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_22
+      network.outgoing.packets.rate_cmaui_port_10:
+      - cmaui_port_10
+      - network.outgoing.packets.rate
+      binding_cmaui_port_10:
+      - cmaui_port_10
+      - binding
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_1
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_10:
+      - cmaui_port_10
+      - network.incoming.bytes
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested3Level
-      network.incoming.packets_cmaui_port_1_test_nested2Level:
+      - network.incoming.packets_cmaui_port_33_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_1
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      dependency_cmaui_port_2_test_nested2Level:
+      local_storage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2
+      - local_storage_server_cmaui_2
       dependency_test_nested2Level:
       - test_nested2Level
       - dependency
-      link_cmaui_port_0:
-      - cmaui_port_0
+      dependency_cmaui_port_10:
+      - cmaui_port_10
+      - dependency
+      link_cmaui_port_10:
+      - cmaui_port_10
       - link
-      link_cmaui_port_3_test_nested3Level_test_nested2Level:
+      dependency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_3_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_2
+      link_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
-      link_cmaui_port_2_test_nested2Level:
+      - link_cmaui_port_32_test_nested3Level
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_3_test_nested3Level
+      link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_3_test_nested4Level_test_nested3Level
-      dependency_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_43_test_nested4Level_test_nested3Level
+      binding_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_3_test_nested3Level
-      dependency_cmaui_port_0:
-      - cmaui_port_0
-      - dependency
-      dependency_server_cmaui_test_nested2Level:
+      - binding_cmaui_port_22
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui
-      dependency_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
+      link_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2_test_nested3Level
-      link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_21
+      dependency_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_3_test_nested4Level_test_nested3Level
-      link_cmaui_port_1_test_nested2Level:
+      - dependency_cmaui_port_33_test_nested3Level
+      dependency_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_1
-      dependency_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_21
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2_test_nested4Level_test_nested3Level
-      link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2_test_nested4Level_test_nested3Level
-      binding_cmaui_port_2_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      dependency_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2
-      local_storage_server_cmaui:
-      - server_cmaui
+      - dependency_cmaui_port_43_test_nested4Level_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
       - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      dependency_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_cmaui_port_42_test_nested4Level_test_nested3Level
+      dependency_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_22
+      dependency_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_32_test_nested3Level
+      link_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - link_cmaui_port_22
       dependency_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested4Level_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
-      link_cmaui_port_2_test_nested3Level_test_nested2Level:
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
+      link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2_test_nested3Level
-      dependency_cmaui_port_1_test_nested2Level:
+      - link_cmaui_port_42_test_nested4Level_test_nested3Level
+      link_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_1
\ No newline at end of file
+      - link_cmaui_port_33_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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index f24b153..849c187 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -56,7 +56,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_2:
+    cmaui_port_21:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -77,26 +77,13 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: p2
-    test_nested3Level:
-      type: org.openecomp.resource.abstract.nodes.heat.nested3
-      directives:
-      - substitutable
-      properties:
-        p1:
-          get_input: p1
-        service_template_filter:
-          substitute_service_template: nested3ServiceTemplate.yaml
-          count: 3
-          mandatory: true
-        p2:
           get_input: p1
-        indx:
-          get_property:
-          - SELF
-          - service_template_filter
-          - index_value
-    server_cmaui:
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_cmaui_2
+          relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -109,7 +96,7 @@ topology_template:
           get_input:
           - cmaui_names
           - 0
-    cmaui_port_1:
+    cmaui_port_22:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -130,12 +117,25 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
+          get_input: p2
+    test_nested3Level:
+      type: org.openecomp.resource.abstract.nodes.heat.nested3
+      directives:
+      - substitutable
+      properties:
+        p1:
           get_input: p1
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
+        service_template_filter:
+          substitute_service_template: nested3ServiceTemplate.yaml
+          count: 3
+          mandatory: true
+        p2:
+          get_input: p1
+        indx:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -143,647 +143,647 @@ topology_template:
         heat_file: ../Artifacts/nested2.yml
         description: nested2
       members:
-      - cmaui_port_2
+      - cmaui_port_21
+      - server_cmaui_2
+      - cmaui_port_22
       - test_nested3Level
-      - server_cmaui
-      - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level:
+      - feature_cmaui_port_42_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_3
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      network.incoming.packets_cmaui_port_3_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_3
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_2_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
+      network.incoming.packets.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets.rate
+      network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_2
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_3
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.bytes.rate_server_cmaui_3
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      binding_cmaui_port_2_test_nested3Level:
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_2
-      disk.device.read.bytes.rate_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
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_33
+      feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_3_test_nested4Level
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - feature_test_nested4Level
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_3_test_nested4Level
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.incoming.bytes_cmaui_port_2_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_32
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_2
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_43_test_nested4Level
+      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
-      - instance_server_cmaui_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested4Level
-      disk.device.capacity_server_cmaui_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
-      - disk.device.capacity_server_cmaui
-      feature_test_nested4Level_test_nested3Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_3_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_42_test_nested4Level
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_3
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_32
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested4Level
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      network.incoming.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes.rate
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_2
-      feature_server_cmaui_test_nested3Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
-      memory.usage_server_cmaui_test_nested3Level:
+      - network.incoming.bytes_cmaui_port_43_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      feature_cmaui_port_3_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes.rate
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_3
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      - 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
-      - binding_server_cmaui
-      binding_cmaui_port_3_test_nested3Level:
+      - host_server_cmaui_3
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_3
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_43_test_nested4Level
+      disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
-      feature_cmaui_port_2_test_nested3Level:
+      - disk.allocation_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_2
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_43_test_nested4Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      network.incoming.packets_cmaui_port_2_test_nested3Level:
+      - memory_server_cmaui_4_test_nested4Level
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_2
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_33
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_2_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      attachment_cmaui_port_3_test_nested3Level:
+      - disk.write.requests_server_cmaui_3
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - binding_cmaui_port_42_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
-      cpu_util_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_33
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu_util_server_cmaui
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes_cmaui_port_42_test_nested4Level
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_32
+      binding_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_33
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_2_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_43_test_nested4Level
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_42_test_nested4Level
+      memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory_server_cmaui_3
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      - feature_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes
+      feature_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_32
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_32
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.root.size_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes
+      disk.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_3_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level_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
-      - network.incoming.packets.rate_cmaui_port_3_test_nested4Level
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
-      cpu_server_cmaui_test_nested4Level_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
+      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
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level:
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      feature_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_3_test_nested4Level
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.packets.rate
+      binding_cmaui_port_22:
+      - cmaui_port_22
+      - binding
+      disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.iops_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_2_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
+      cpu_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_3
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      - 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.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_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
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      network.outgoing.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.packets.rate
+      binding_cmaui_port_21:
+      - cmaui_port_21
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested4Level
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - instance_server_cmaui_3
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_2_test_nested4Level
-      disk.write.requests.rate_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.write.requests.rate_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
-      disk.iops_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_42_test_nested4Level
+      attachment_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
+      - attachment_cmaui_port_33
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      - disk.device.read.bytes.rate_server_cmaui_3
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      network.outgoing.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes.rate
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.resident_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      - network.incoming.bytes_cmaui_port_33
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_3_test_nested4Level
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.usage_server_cmaui_3
+      network.outpoing.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.outpoing.packets
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      - disk.write.bytes_server_cmaui_3
+      network.outpoing.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.outpoing.packets
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      network.incoming.bytes.rate_cmaui_port_3_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_3
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_22:
+      - cmaui_port_22
+      - feature
+      feature_cmaui_port_21:
+      - cmaui_port_21
+      - feature
+      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:
+      - scalable_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
-      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:
+      - network.incoming.bytes_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_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:
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.allocation_server_cmaui_3
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_3_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_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:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.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.requests.rate_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_3
-      disk.capacity_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
+      attachment_cmaui_port_21:
+      - cmaui_port_21
+      - attachment
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_3_test_nested4Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_43_test_nested4Level
+      attachment_cmaui_port_22:
+      - cmaui_port_22
+      - attachment
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      network.incoming.bytes_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level
+      network.incoming.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes
+      endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_2_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      instance_server_cmaui_test_nested3Level:
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level:
+      - vcpus_server_cmaui_3
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_2
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_42_test_nested4Level
+      disk.allocation_server_cmaui_4_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
-      network.incoming.bytes_cmaui_port_3_test_nested3Level:
+      - disk.allocation_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_3
-      cpu_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_32
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.write.bytes_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_2_test_nested4Level
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_33
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
-      attachment_cmaui_port_2_test_nested3Level:
+      - attachment_cmaui_port_42_test_nested4Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_2
-      scalable_server_cmaui_test_nested3Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
-      disk.device.iops_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
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      - binding_server_cmaui_4_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      attachment_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_32
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_32
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_2_test_nested4Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests_server_cmaui_3
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
-    requirements:
-      dependency_server_cmaui_test_nested3Level:
+      - network.incoming.packets_cmaui_port_42_test_nested4Level
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      dependency_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.ephemeral.size_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_3_test_nested4Level
-      link_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_2_test_nested4Level
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      link_cmaui_port_2_test_nested3Level:
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
+    requirements:
+      dependency_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_2_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+      - dependency_cmaui_port_42_test_nested4Level
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
-      dependency_cmaui_port_3_test_nested3Level:
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_3
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
+      - local_storage_server_cmaui_3
+      link_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_42_test_nested4Level
+      dependency_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_cmaui_port_43_test_nested4Level
+      binding_cmaui_port_22:
+      - cmaui_port_22
+      - binding
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
-      link_cmaui_port_3_test_nested3Level:
+      - dependency_cmaui_port_33
+      link_cmaui_port_22:
+      - cmaui_port_22
+      - link
+      dependency_cmaui_port_21:
+      - cmaui_port_21
+      - dependency
+      link_cmaui_port_21:
+      - cmaui_port_21
+      - link
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_3
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      - dependency_server_cmaui_3
+      dependency_cmaui_port_22:
+      - cmaui_port_22
       - dependency
-      dependency_cmaui_port_2_test_nested3Level:
+      link_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_33
+      link_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_32
+      link_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_2
-      link_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - link_cmaui_port_43_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_3_test_nested4Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_server_cmaui_2:
+      - server_cmaui_2
       - dependency
-      local_storage_server_cmaui_test_nested3Level:
+      dependency_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_32
\ 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 7b4d97a..fa9b3d3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -59,7 +59,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_3:
+    cmaui_port_32:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -80,11 +80,11 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: p2
+          get_input: p1
       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
@@ -97,7 +97,20 @@ topology_template:
           substitute_service_template: nested4ServiceTemplate.yaml
         p2:
           get_input: p2
-    cmaui_port_2:
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
+    cmaui_port_33:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -118,25 +131,12 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: p1
+          get_input: p2
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -144,431 +144,431 @@ topology_template:
         heat_file: ../Artifacts/nested3.yml
         description: nested3
       members:
-      - cmaui_port_3
+      - cmaui_port_32
       - test_nested4Level
-      - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_3
+      - cmaui_port_33
   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
-      binding_cmaui_port_2_test_nested4Level:
-      - test_nested4Level
-      - binding_cmaui_port_2
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      network.incoming.bytes_cmaui_port_2_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes_cmaui_port_2
-      memory_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      network.outpoing.packets_cmaui_port_3_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      attachment_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - network.outpoing.packets_cmaui_port_3
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
+      - attachment_cmaui_port_42
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      network.incoming.bytes.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.bytes.rate
+      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
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      network.outpoing.packets_cmaui_port_2_test_nested4Level:
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.outpoing.packets_cmaui_port_2
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      feature_cmaui_port_2_test_nested4Level:
+      - network.outgoing.bytes.rate_cmaui_port_43
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      feature_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - feature_cmaui_port_2
-      cpu_server_cmaui_test_nested4Level:
+      - feature_cmaui_port_42
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
+      binding_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - binding_cmaui_port_43
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      network.outgoing.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes
-      network.incoming.bytes_cmaui_port_3_test_nested4Level:
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
+      attachment_cmaui_port_32:
+      - cmaui_port_32
+      - attachment
+      attachment_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes_cmaui_port_3
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level:
+      - attachment_cmaui_port_43
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      attachment_cmaui_port_2_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      attachment_cmaui_port_33:
+      - cmaui_port_33
+      - attachment
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - attachment_cmaui_port_2
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      - disk.device.read.requests_server_cmaui_4
+      network.outgoing.bytes.rate_cmaui_port_42_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:
+      - network.outgoing.bytes.rate_cmaui_port_42
+      network.incoming.packets.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.packets.rate
+      disk.device.write.requests_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.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
-      - host_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level:
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes.rate_cmaui_port_3
-      attachment_cmaui_port_3_test_nested4Level:
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      binding_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - attachment_cmaui_port_3
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      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:
+      - binding_cmaui_port_42
+      feature_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level:
+      - feature_cmaui_port_43
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      - binding_server_cmaui_4
+      os_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level:
+      - os_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets.rate_cmaui_port_2
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      - cpu.delta_server_cmaui_4
+      network.incoming.bytes_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - network.incoming.bytes_cmaui_port_42
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.capacity_server_cmaui_4
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      network.outpoing.packets_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
+      - network.outpoing.packets_cmaui_port_42
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - binding_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      binding_cmaui_port_3:
-      - cmaui_port_3
-      - binding
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_3
-      binding_cmaui_port_3_test_nested4Level:
+      - endpoint_server_cmaui_4
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - binding_cmaui_port_3
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes.rate
-      feature_server_cmaui_test_nested4Level:
+      - vcpus_server_cmaui_4
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
       - disk.iops
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level:
-      - test_nested4Level
-      - network.outgoing.packets.rate_cmaui_port_3
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      feature_cmaui_port_3_test_nested4Level:
-      - test_nested4Level
-      - feature_cmaui_port_3
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.packets_cmaui_port_3_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets_cmaui_port_3
-      scalable_server_cmaui_test_nested4Level:
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.outgoing.bytes.rate
+      network.incoming.packets_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level:
+      - network.incoming.packets_cmaui_port_42
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes.rate_cmaui_port_3
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      - network.incoming.bytes.rate_cmaui_port_42
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.allocation_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.device.allocation_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      - cpu_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      - network.outgoing.packets.rate_cmaui_port_43
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
+      network.outgoing.bytes_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.bytes
+      feature_cmaui_port_33:
+      - cmaui_port_33
       - feature
-      feature_cmaui_port_3:
-      - cmaui_port_3
+      feature_cmaui_port_32:
+      - cmaui_port_32
       - feature
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
+      - network.outgoing.bytes_cmaui_port_43
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
+      network.outgoing.bytes_cmaui_port_33:
+      - cmaui_port_33
+      - network.outgoing.bytes
+      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
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      attachment_cmaui_port_3:
-      - cmaui_port_3
-      - attachment
-      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
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      - instance_server_cmaui_4
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.packets.rate_cmaui_port_42
+      network.outgoing.bytes.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.bytes.rate
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
       - disk.usage
-      network.outgoing.packets.rate_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_33:
+      - cmaui_port_33
       - network.outgoing.packets.rate
-      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
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level:
+      binding_cmaui_port_33:
+      - cmaui_port_33
+      - binding
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets.rate_cmaui_port_3
-      disk.iops_server_cmaui_test_nested4Level:
+      - memory_server_cmaui_4
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      endpoint_server_cmaui_test_nested4Level:
+      - network.incoming.packets.rate_cmaui_port_43
+      network.incoming.packets_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
+      - network.incoming.packets_cmaui_port_43
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      - disk.root.size_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.packets.rate
+      binding_cmaui_port_32:
+      - cmaui_port_32
+      - binding
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      network.incoming.bytes_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.bytes
+      disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      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.read.bytes_server_cmaui_test_nested4Level:
+      - disk.device.latency_server_cmaui_4
+      network.incoming.packets_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.packets
+      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.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.ephemeral.size_server_cmaui_4
+      network.incoming.bytes_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.bytes
+      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.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.allocation_server_cmaui_4
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      network.outpoing.packets_cmaui_port_33:
+      - cmaui_port_33
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_32:
+      - cmaui_port_32
+      - network.outpoing.packets
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - os_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level:
+      - network.incoming.packets.rate_cmaui_port_42
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
+      network.outpoing.packets_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_2
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      memory.usage_server_cmaui_test_nested4Level:
+      - network.outpoing.packets_cmaui_port_43
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.usage_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      network.incoming.packets_cmaui_port_2_test_nested4Level:
+      - disk.device.read.bytes.rate_server_cmaui_4
+      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.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets_cmaui_port_2
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes.rate
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      - network.incoming.bytes.rate_cmaui_port_43
+      network.incoming.bytes_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - network.incoming.bytes_cmaui_port_43
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - network.outgoing.bytes_cmaui_port_42
+      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
-      link_cmaui_port_3_test_nested4Level:
+      link_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - link_cmaui_port_3
-      local_storage_server_cmaui_test_nested4Level:
+      - link_cmaui_port_42
+      dependency_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - local_storage_server_cmaui
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
-      link_cmaui_port_3:
-      - cmaui_port_3
-      - link
-      dependency_cmaui_port_2_test_nested4Level:
+      - dependency_cmaui_port_42
+      local_storage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - dependency_cmaui_port_2
+      - local_storage_server_cmaui_4
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       dependency_test_nested4Level:
       - test_nested4Level
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
+      link_cmaui_port_33:
+      - cmaui_port_33
+      - link
+      dependency_cmaui_port_32:
+      - cmaui_port_32
+      - dependency
+      link_cmaui_port_32:
+      - cmaui_port_32
+      - link
+      dependency_cmaui_port_33:
+      - cmaui_port_33
+      - dependency
+      link_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - dependency_server_cmaui
-      dependency_cmaui_port_3_test_nested4Level:
+      - link_cmaui_port_43
+      dependency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - dependency_cmaui_port_3
-      dependency_cmaui_port_3:
-      - cmaui_port_3
-      - dependency
-      link_cmaui_port_2_test_nested4Level:
+      - dependency_server_cmaui_4
+      dependency_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      - dependency_cmaui_port_43
+      dependency_server_cmaui_3:
+      - server_cmaui_3
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 03ca09b..2483f9f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_3:
+    cmaui_port_43:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -80,9 +80,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_2:
+    cmaui_port_42:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -107,9 +107,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:
@@ -129,217 +129,217 @@ topology_template:
         heat_file: ../Artifacts/nested4.yml
         description: nested4
       members:
-      - cmaui_port_3
-      - cmaui_port_2
-      - server_cmaui
+      - cmaui_port_43
+      - cmaui_port_42
+      - 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
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      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
-      feature_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
+      feature_cmaui_port_42:
+      - cmaui_port_42
       - feature
-      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
-      attachment_cmaui_port_2:
-      - cmaui_port_2
+      attachment_cmaui_port_43:
+      - cmaui_port_43
       - attachment
-      attachment_cmaui_port_3:
-      - cmaui_port_3
+      attachment_cmaui_port_42:
+      - cmaui_port_42
       - attachment
-      network.outgoing.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
       - disk.read.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      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
+      network.incoming.bytes_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.bytes
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      network.outgoing.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
+      network.outgoing.bytes_cmaui_port_42:
+      - cmaui_port_42
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_43:
+      - cmaui_port_43
+      - network.outgoing.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.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_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
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
+      network.incoming.packets.rate_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.packets.rate
+      network.outgoing.packets.rate_cmaui_port_43:
+      - cmaui_port_43
+      - network.outgoing.packets.rate
+      binding_cmaui_port_43:
+      - cmaui_port_43
+      - binding
+      network.incoming.packets.rate_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.packets.rate
+      network.outgoing.packets.rate_cmaui_port_42:
+      - cmaui_port_42
+      - network.outgoing.packets.rate
+      binding_cmaui_port_42:
+      - cmaui_port_42
       - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
+      network.outpoing.packets_cmaui_port_43:
+      - cmaui_port_43
+      - network.outpoing.packets
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
       - disk.device.read.requests.rate
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      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
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
+      network.outpoing.packets_cmaui_port_42:
+      - cmaui_port_42
+      - network.outpoing.packets
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      feature_cmaui_port_43:
+      - cmaui_port_43
       - feature
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      binding_cmaui_port_3:
-      - cmaui_port_3
-      - binding
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.ephemeral.size
+      network.incoming.bytes.rate_cmaui_port_42:
+      - cmaui_port_42
       - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
+      network.incoming.bytes.rate_cmaui_port_43:
+      - cmaui_port_43
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
+      network.outgoing.bytes.rate_cmaui_port_42:
+      - cmaui_port_42
       - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_43:
+      - cmaui_port_43
       - network.outgoing.bytes.rate
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      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
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      link_cmaui_port_2:
-      - cmaui_port_2
+      link_cmaui_port_42:
+      - cmaui_port_42
       - link
-      dependency_cmaui_port_3:
-      - cmaui_port_3
+      dependency_server_cmaui_4:
+      - server_cmaui_4
+      - dependency
+      dependency_cmaui_port_42:
+      - cmaui_port_42
+      - dependency
+      dependency_cmaui_port_43:
+      - cmaui_port_43
       - dependency
-      link_cmaui_port_3:
-      - cmaui_port_3
+      link_cmaui_port_43:
+      - cmaui_port_43
       - link
-      dependency_cmaui_port_2:
-      - cmaui_port_2
-      - dependency
\ No newline at end of file
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested1.yml
index 66ec32f..222d68b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested1.yml
@@ -29,7 +29,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_0:
+  cmaui_port_10:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -37,7 +37,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -45,7 +45,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_0 }
+      - port: { get_resource: cmaui_port_10 }
 
   test_nested2Level:
     type: nested2.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested2.yml
index 2af4650..c4e803f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested2.yml
@@ -29,7 +29,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_1:
+  cmaui_port_21:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -37,7 +37,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_22:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -45,7 +45,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -53,7 +53,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_port_21 }
 
   test_nested3Level:
     type: OS::Heat::ResourceGroup

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested3.yml
index 2eacdf7..bbae236 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested3.yml
@@ -30,7 +30,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_2:
+  cmaui_port_32:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -38,7 +38,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_3:
+  cmaui_port_33:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -54,8 +54,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
-      - port: { get_resource: cmaui_port_3 }
+      - port: { get_resource: cmaui_port_32 }
+      - port: { get_resource: cmaui_port_33 }
 
   test_nested4Level:
     type: nested4.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested4.yml
index deca174..88b8d04 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/inputfiles/nested4.yml
@@ -28,7 +28,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_2:
+  cmaui_port_42:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -36,7 +36,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_3:
+  cmaui_port_43:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p1 }
@@ -44,7 +44,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -52,5 +52,5 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
-      - port: { get_resource: cmaui_port_3 }
\ No newline at end of file
+      - port: { get_resource: cmaui_port_42 }
+      - port: { get_resource: cmaui_port_43 }
\ 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/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 6602b62..d22a743 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -70,27 +70,40 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_12:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_12:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_cmaui_port_11:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - link_cmaui_port_11:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_server_cmaui_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -124,39 +137,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_1:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - link_cmaui_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.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_abc:
         type: org.openecomp.capabilities.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_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:
@@ -168,23 +156,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      os_server_abc:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      cpu_server_abc:
         type: org.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_abc:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_abc:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -202,14 +185,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.root.size_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -228,19 +210,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -251,54 +221,55 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_abc:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.requests_server_abc:
         type: org.openecomp.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_abc:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_abc:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      disk.capacity_server_abc:
         type: org.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.device.write.bytes_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -321,7 +292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -333,221 +304,183 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_abc_port_1:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_abc:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.requests.rate_server_abc:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_12:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
+      feature_cmaui_port_11:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      instance_server_abc:
+      network.outpoing.packets_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_abc_port_1:
+      network.incoming.bytes.rate_cmaui_port_11:
         type: org.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.bytes.rate_cmaui_port_12:
         type: org.openecomp.capabilities.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_abc:
+      network.outgoing.bytes_cmaui_port_11:
         type: org.openecomp.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.outgoing.bytes_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
-        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_abc:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      disk.write.requests.rate_server_abc:
         type: org.openecomp.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.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      instance_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      network.incoming.packets.rate_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      disk.device.write.bytes.rate_server_abc:
         type: org.openecomp.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_abc:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_abc:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_11:
         type: org.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.allocation_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_abc_port_1:
+      network.outpoing.packets_cmaui_port_11:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.device.iops_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_12:
         type: org.openecomp.capabilities.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.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.incoming.packets_abc_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -557,27 +490,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.device.latency_server_abc:
         type: org.openecomp.capabilities.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_abc:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 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_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -587,9 +519,8 @@ 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_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
@@ -599,11 +530,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.usage_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -616,7 +542,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -633,7 +559,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_12:
+        type: org.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_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:
@@ -645,6 +583,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.read.bytes.rate_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -704,7 +649,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -716,53 +661,55 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_12:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_12:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.write.requests.rate_server_abc:
         type: org.openecomp.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.outgoing.packets.rate_cmaui_port_11:
         type: org.openecomp.capabilities.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_abc:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_11:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.read.requests_server_abc:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -777,20 +724,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      disk.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_12:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_11:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -806,6 +770,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_cmaui_port_12:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_11:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_cmaui_port_12:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_11:
+        type: org.openecomp.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_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_server_abc:
         type: tosca.capabilities.Node
         occurrences:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index 0ef23f2..4835546 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -56,17 +56,17 @@ topology_template:
         p2:
           get_input: shared_network_id2
       requirements:
-      - link_cmaui_port_2:
+      - link_cmaui_port_12:
           capability: tosca.capabilities.network.Linkable
           node: test_net2
           relationship: tosca.relationships.network.LinksTo
-      - link_abc_port_1:
+      - link_cmaui_port_11:
           capability: tosca.capabilities.network.Linkable
-          node: test_net2
+          node: test_net1
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1:
+      - link_abc_port_1:
           capability: tosca.capabilities.network.Linkable
-          node: test_net1
+          node: test_net2
           relationship: tosca.relationships.network.LinksTo
     test_net1:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
@@ -86,17 +86,17 @@ topology_template:
         p2:
           get_input: shared_network_id2
       requirements:
-      - link_cmaui_port_2:
+      - link_cmaui_port_12:
           capability: tosca.capabilities.network.Linkable
           node: test_net2
           relationship: tosca.relationships.network.LinksTo
-      - link_abc_port_1:
+      - link_cmaui_port_11:
           capability: tosca.capabilities.network.Linkable
-          node: test_net2
+          node: test_net1
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1:
+      - link_abc_port_1:
           capability: tosca.capabilities.network.Linkable
-          node: test_net1
+          node: test_net2
           relationship: tosca.relationships.network.LinksTo
   groups:
     main_group:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
index 3e4b05d..246a6cd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -76,7 +76,7 @@ topology_template:
       type: string
       description: Image for CMAUI server
   node_templates:
-    cmaui_port_2:
+    cmaui_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -101,9 +101,36 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    cmaui_port_11:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        replacement_policy: AUTO
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        security_groups:
+        - get_input: security_group_name
+        fixed_ips:
+        - ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 0
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        network:
+          get_input: shared_network_id1
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_cmaui_1
+          relationship: tosca.relationships.network.BindsTo
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -156,33 +183,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: server_abc
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_1:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        replacement_policy: AUTO
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        security_groups:
-        - get_input: security_group_name
-        fixed_ips:
-        - ip_address:
-            get_input:
-            - cmaui_oam_ips
-            - 0
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: shared_network_id1
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -190,98 +190,83 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: cmaui server template for vMMSC
       members:
-      - cmaui_port_2
-      - server_cmaui
+      - cmaui_port_12
+      - cmaui_port_11
+      - server_cmaui_1
       - server_abc
       - abc_port_1
-      - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
       disk.write.bytes.rate_server_abc:
       - server_abc
       - disk.write.bytes.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
       memory.resident_server_abc:
       - server_abc
       - memory.resident
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
       os_server_abc:
       - server_abc
       - os
       cpu_server_abc:
       - server_abc
       - cpu
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
       network.outgoing.packets.rate_abc_port_1:
       - abc_port_1
       - network.outgoing.packets.rate
       disk.device.usage_server_abc:
       - server_abc
       - disk.device.usage
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
       binding_abc_port_1:
       - abc_port_1
       - binding
       disk.device.write.requests_server_abc:
       - server_abc
       - disk.device.write.requests
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       feature_abc_port_1:
       - abc_port_1
       - feature
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
       disk.write.requests_server_abc:
       - server_abc
       - disk.write.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
       - disk.device.read.bytes
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       disk.capacity_server_abc:
       - server_abc
       - disk.capacity
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
       disk.device.write.bytes_server_abc:
       - server_abc
       - disk.device.write.bytes
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
       disk.device.read.bytes.rate_server_abc:
       - server_abc
       - disk.device.read.bytes.rate
@@ -291,171 +276,159 @@ topology_template:
       attachment_abc_port_1:
       - abc_port_1
       - attachment
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
       disk.read.bytes_server_abc:
       - server_abc
       - disk.read.bytes
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      feature_cmaui_port_12:
+      - cmaui_port_12
+      - feature
+      feature_cmaui_port_11:
+      - cmaui_port_11
+      - feature
       network.outpoing.packets_abc_port_1:
       - abc_port_1
       - network.outpoing.packets
+      network.incoming.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.bytes
       endpoint_server_abc:
       - server_abc
       - endpoint
       disk.write.requests.rate_server_abc:
       - server_abc
       - disk.write.requests.rate
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
       instance_server_abc:
       - server_abc
       - instance
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
       network.incoming.packets.rate_abc_port_1:
       - abc_port_1
       - network.incoming.packets.rate
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
       disk.device.write.bytes.rate_server_abc:
       - server_abc
       - disk.device.write.bytes.rate
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
+      network.incoming.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets.rate
       disk.allocation_server_abc:
       - server_abc
       - disk.allocation
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      network.outpoing.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.outpoing.packets
       disk.device.iops_server_abc:
       - server_abc
       - disk.device.iops
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      network.outpoing.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.outpoing.packets
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
       - feature
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
       network.incoming.packets_abc_port_1:
       - abc_port_1
       - network.incoming.packets
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      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
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
       disk.root.size_server_abc:
       - server_abc
       - disk.root.size
-      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_1:
+      - server_cmaui_1
+      - disk.write.requests
       disk.device.latency_server_abc:
       - server_abc
       - disk.device.latency
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       memory_server_abc:
       - server_abc
       - memory
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
       disk.device.read.bytes_server_abc:
       - server_abc
       - disk.device.read.bytes
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
       memory.usage_server_abc:
       - server_abc
       - memory.usage
       disk.read.requests_server_abc:
       - server_abc
       - disk.read.requests
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       disk.usage_server_abc:
       - server_abc
       - disk.usage
       scalable_server_abc:
       - server_abc
       - scalable
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.bytes.rate
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
       disk.write.bytes_server_abc:
       - server_abc
       - disk.write.bytes
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       disk.read.bytes.rate_server_abc:
       - server_abc
       - disk.read.bytes.rate
@@ -486,57 +459,84 @@ topology_template:
       network.incoming.bytes_abc_port_1:
       - abc_port_1
       - network.incoming.bytes
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
       disk.device.allocation_server_abc:
       - server_abc
       - disk.device.allocation
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
+      network.outgoing.packets.rate_cmaui_port_12:
+      - cmaui_port_12
+      - network.outgoing.packets.rate
+      binding_cmaui_port_12:
+      - cmaui_port_12
+      - binding
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
       - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
       disk.device.write.requests.rate_server_abc:
       - server_abc
       - disk.device.write.requests.rate
+      network.outgoing.packets.rate_cmaui_port_11:
+      - cmaui_port_11
+      - network.outgoing.packets.rate
+      binding_cmaui_port_11:
+      - cmaui_port_11
+      - binding
       disk.device.read.requests_server_abc:
       - server_abc
       - disk.device.read.requests
       host_server_abc:
       - server_abc
       - host
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
+      attachment_cmaui_port_12:
+      - cmaui_port_12
+      - attachment
+      attachment_cmaui_port_11:
+      - cmaui_port_11
+      - attachment
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
       cpu.delta_server_abc:
       - server_abc
       - cpu.delta
       disk.latency_server_abc:
       - server_abc
       - disk.latency
+      network.incoming.bytes_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_12:
+      - cmaui_port_12
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_11:
+      - cmaui_port_11
+      - network.incoming.bytes
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
       feature_server_abc:
       - server_abc
       - feature
@@ -550,27 +550,27 @@ topology_template:
       dependency_server_abc:
       - server_abc
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
+      link_cmaui_port_11:
+      - cmaui_port_11
+      - link
+      dependency_cmaui_port_11:
+      - cmaui_port_11
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      dependency_cmaui_port_12:
+      - cmaui_port_12
       - dependency
+      link_cmaui_port_12:
+      - cmaui_port_12
+      - link
       link_abc_port_1:
       - abc_port_1
       - link
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_server_cmaui_1:
+      - server_cmaui_1
       - dependency
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
       local_storage_server_abc:
       - server_abc
       - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/inputfiles/nested1.yml
index 9ad6c61..d4ae6e9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/inputfiles/nested1.yml
@@ -40,7 +40,7 @@ parameters:
     type: string
 resources:
 
-  cmaui_port_1:
+  cmaui_port_11:
     type: OS::Neutron::Port
     properties:
       network: { get_param: shared_network_id1 }
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_12:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -64,7 +64,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -72,8 +72,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
-      - port: { get_resource: cmaui_port_2 }
+      - port: { get_resource: cmaui_port_11 }
+      - port: { get_resource: cmaui_port_12 }
 
   server_abc:
     type: OS::Nova::Server

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 7d178eb..713b80e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -52,14 +52,14 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -73,141 +73,141 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested2Level:
+    - dependency_cmaui_port_21_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested2Level:
+    - link_cmaui_port_21_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - binding_cmaui_port_2_test_nested2Level:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_2_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_22_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_22_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested4Level_test_nested3Level_test_nested2Level:
+    - binding_cmaui_port_22_test_nested2Level:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_cmaui_port_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_32_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_cmaui_port_43_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:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested3Level_test_nested2Level:
+        - 1
+        - 1
+    - dependency_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested3Level_test_nested2Level:
+    - link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_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
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_cmaui_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_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1_test_nested2Level:
+    - dependency_cmaui_port_33_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_1_test_nested2Level:
+    - link_cmaui_port_33_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -227,282 +227,247 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
+      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:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      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.allocation_server_cmaui:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_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_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_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
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1_test_nested2Level:
+      disk.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_42_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
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_0:
+      network.incoming.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level_test_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_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_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
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_21_test_nested2Level:
         type: org.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
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_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.
+      feature_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_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:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level_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
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.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:
+      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
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_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
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      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
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      network.outpoing.packets_cmaui_port_42_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
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level_test_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_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_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.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_22_test_nested2Level:
         type: org.openecomp.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:
@@ -515,13 +480,9 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.packets.rate_cmaui_port_43_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
@@ -530,96 +491,91 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      network.incoming.packets_cmaui_port_43_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
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.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_test_nested2Level:
+      network.incoming.bytes_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_0:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_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.
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -631,21 +587,27 @@ node_types:
         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:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      binding_cmaui_port_33_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.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.requests.rate_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -654,948 +616,972 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_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:
         - 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.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      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
-      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         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.
+      feature_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_43_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
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_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
-      network.incoming.packets.rate_cmaui_port_2_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:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_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.rate_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.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.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
-      feature_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      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
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2_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.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.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:
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_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
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_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
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_33_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.outpoing.packets_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.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:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_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
-      memory_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_cmaui_port_1_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
-      disk.allocation_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
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      network.outpoing.packets_cmaui_port_0:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_22_test_nested2Level:
         type: org.openecomp.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_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.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_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.iops_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_21_test_nested2Level:
         type: org.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
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_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.outgoing.bytes.rate_cmaui_port_2_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_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      network.incoming.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      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.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      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
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1_test_nested2Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_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
-      cpu_util_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2_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
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      cpu_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.requests_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.write.requests.rate_server_cmaui_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.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_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.capacity_server_cmaui_test_nested2Level:
+      network.incoming.packets_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_43_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
-      attachment_cmaui_port_2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      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
-      disk.device.usage_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.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      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
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1_test_nested2Level:
+      attachment_cmaui_port_22_test_nested2Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      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
-      disk.latency_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
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_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
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1_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
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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:
+      network.incoming.bytes_cmaui_port_43_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:
+      network.outgoing.bytes.rate_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_0:
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.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_nested2Level:
+      network.outpoing.packets_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_43_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_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_42_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_cmaui_port_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_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.
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_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
-      disk.device.write.bytes_server_cmaui_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:
         - 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:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.outpoing.packets_cmaui_port_22_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_cmaui_port_22_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      vcpus_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_21_test_nested2Level:
         type: org.openecomp.capabilities.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:
+      network.outgoing.packets.rate_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2Level:
+      attachment_cmaui_port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      binding_cmaui_port_2_test_nested2Level:
+      binding_cmaui_port_21_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_0:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.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_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:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_21_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_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:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      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.packets.rate_cmaui_port_0:
+      disk.device.latency_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      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
-      attachment_cmaui_port_0:
-        type: tosca.capabilities.Attachment
+      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.outpoing.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_43_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.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
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
         valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.device.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.
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      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.
+      host_server_cmaui_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_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_cmaui_port_22_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_42_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.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_cmaui_port_32_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      memory.resident_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
-      network.incoming.packets_cmaui_port_3_test_nested3Level_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
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      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
+      vcpus_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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:
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.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:
+      network.incoming.bytes_cmaui_port_42_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.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      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
-      network.incoming.bytes.rate_cmaui_port_0:
+      vcpus_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      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
-      cpu.delta_server_cmaui_test_nested2Level:
+      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:
@@ -1606,60 +1592,74 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_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
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.outgoing.packets.rate_cmaui_port_22_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.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
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
         type: org.openecomp.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:
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1712,1268 +1712,1268 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_21:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_21:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - binding_cmaui_port_2:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_test_nested3Level:
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested3Level:
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_22:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested3Level:
+    - link_cmaui_port_22:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_test_nested4Level_test_nested3Level:
+    - binding_cmaui_port_22:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level_test_nested3Level:
+    - dependency_cmaui_port_32_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level_test_nested3Level:
+    - link_cmaui_port_32_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level_test_nested3Level:
+    - dependency_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level_test_nested3Level:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_cmaui_port_43_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:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_43_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_cmaui_port_2_test_nested3Level:
+        - 1
+        - 1
+    - dependency_cmaui_port_42_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested3Level:
+    - link_cmaui_port_42_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_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_nested3Level:
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_server_cmaui:
+    - 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:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_cmaui_port_33_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_1:
+    - link_cmaui_port_33_test_nested3Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      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:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      network.outpoing.packets_cmaui_port_43_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_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
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_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
-      network.outgoing.bytes.rate_cmaui_port_2_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
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_21:
         type: org.openecomp.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:
+      network.outgoing.bytes.rate_cmaui_port_42_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
+      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
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_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
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level:
+      feature_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_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
-      network.outgoing.bytes_cmaui_port_1:
+      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
-      instance_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.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      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
-      feature_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes_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:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.Node
+      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
-      instance_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_22:
         type: org.openecomp.capabilities.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.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
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.Node
+      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
-      network.outgoing.packets.rate_cmaui_port_2_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
-      network.incoming.packets_cmaui_port_2_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2:
+      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
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.allocation_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_43_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_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      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
-      disk.write.requests.rate_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
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level:
+      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
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.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.rate_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_42_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_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.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:
+      binding_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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.device.read.requests_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
-      disk.write.requests_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
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      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
-      binding_cmaui_port_1:
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_42_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_server_cmaui_test_nested4Level_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
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      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
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_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.iops_server_cmaui:
+      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.bytes_cmaui_port_2:
+      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.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_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
-      network.incoming.bytes_cmaui_port_1:
+      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.root.size_server_cmaui_test_nested3Level:
+      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
-      cpu_server_cmaui_test_nested4Level_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.incoming.bytes.rate_cmaui_port_2_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
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_22:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_22:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_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
-      feature_cmaui_port_1:
+      feature_server_cmaui_2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      disk.allocation_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_cmaui_port_21:
         type: org.openecomp.capabilities.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:
+      binding_cmaui_port_21:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_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
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      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.write.requests.rate_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.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_42_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.iops_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.
+      attachment_cmaui_port_33_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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.device.latency_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.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      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.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
         type: org.openecomp.capabilities.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.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      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
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_22:
         type: org.openecomp.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.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.usage_server_cmaui:
+      network.outpoing.packets_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_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.allocation_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
-      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.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      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
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      feature_cmaui_port_22:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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.
+      feature_cmaui_port_21:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_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
-      memory_server_cmaui:
+      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
-      network.incoming.bytes.rate_cmaui_port_2_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.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_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.
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_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.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.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.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_test_nested3Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_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.write.bytes_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
+        type: org.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:
-        type: tosca.capabilities.Scalable
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_21:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_43_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_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_22:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.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.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cmaui_port_42_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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_21:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.packets_cmaui_port_22:
         type: org.openecomp.capabilities.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:
+      network.incoming.bytes_cmaui_port_22:
         type: org.openecomp.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:
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_42_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:
+      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
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      binding_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
         type: org.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.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
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level:
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu_util_server_cmaui_test_nested4Level_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
-      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
-      network.incoming.bytes_cmaui_port_3_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
-      cpu_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
-      disk.usage_server_cmaui_test_nested3Level:
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_32_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      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
-      network.outpoing.packets_cmaui_port_2:
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.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
-      attachment_cmaui_port_2_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_42_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_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:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2_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
-      disk.read.requests_server_cmaui_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
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3029,14 +3029,14 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_3:
+    - dependency_cmaui_port_32:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3:
+    - link_cmaui_port_32:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -3049,820 +3049,820 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_3_test_nested4Level:
+    - dependency_cmaui_port_43_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3_test_nested4Level:
+    - link_cmaui_port_43_test_nested4Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2_test_nested4Level:
+    - dependency_cmaui_port_42_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2_test_nested4Level:
+    - link_cmaui_port_42_test_nested4Level:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         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
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_2:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_3:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_33:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_33:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     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
-      binding_cmaui_port_2_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      attachment_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.Attachment
         occurrences:
-        - 0
+        - 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
-      network.incoming.bytes_cmaui_port_2_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:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_33:
         type: org.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
+      network.incoming.bytes.rate_cmaui_port_32:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.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
-      instance_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
-      disk.root.size_server_cmaui_test_nested4Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.read.requests_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_43_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_util_server_cmaui:
+      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
-      feature_cmaui_port_2_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_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.usage_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.
+      binding_cmaui_port_43_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_4_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3:
+      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
-      network.incoming.bytes_cmaui_port_3_test_nested4Level:
+      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
-      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.
+      attachment_cmaui_port_32:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43_test_nested4Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level:
+      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
-      attachment_cmaui_port_2_test_nested4Level:
+      attachment_cmaui_port_33:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_42_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:
+      network.incoming.packets.rate_cmaui_port_33:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets.rate_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.device.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
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3_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
-      attachment_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.Attachment
+      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
-      network.incoming.packets_cmaui_port_3:
+      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
-      network.incoming.packets_cmaui_port_2:
+      disk.device.read.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      binding_cmaui_port_42_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      feature_cmaui_port_43_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      memory_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.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.
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2_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.write.requests.rate_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
-      disk.device.iops_server_cmaui_test_nested4Level:
+      network.incoming.bytes_cmaui_port_42_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:
+      disk.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      network.outpoing.packets_cmaui_port_42_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
+      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
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      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
-      disk.ephemeral.size_server_cmaui:
+      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
-      network.outgoing.bytes.rate_cmaui_port_2:
+      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
-      network.outgoing.bytes.rate_cmaui_port_3:
+      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
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3:
+      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
-      network.outgoing.packets.rate_cmaui_port_3_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.iops_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      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.capacity_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_33:
         type: org.openecomp.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:
+      network.incoming.packets_cmaui_port_42_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_42_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
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_3_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.device.read.bytes.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.device.allocation_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      network.outgoing.packets.rate_cmaui_port_43_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_cmaui_port_2:
+      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
-      cpu_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
-      network.incoming.packets.rate_cmaui_port_3:
+      network.outgoing.bytes_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
+      feature_cmaui_port_33:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
+      feature_cmaui_port_32:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_43_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.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_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.device.read.bytes.rate_server_cmaui:
+      network.outgoing.bytes_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
+      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
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_32:
         type: org.openecomp.capabilities.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_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      disk.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      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.outgoing.packets.rate_cmaui_port_3:
+      network.outgoing.packets.rate_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_cmaui_port_33:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      endpoint_server_cmaui_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      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
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_43_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_cmaui_port_3_test_nested4Level:
+      network.incoming.packets_cmaui_port_43_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.iops_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_32:
         type: org.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
+      binding_cmaui_port_32:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      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
-      memory_server_cmaui:
+      network.incoming.bytes_cmaui_port_32:
         type: org.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.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:
+      network.incoming.packets_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level:
+      network.incoming.packets_cmaui_port_33:
         type: org.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.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.read.requests.rate_server_cmaui:
+      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.write.bytes_server_cmaui:
+      network.incoming.bytes_cmaui_port_33:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      network.outpoing.packets_cmaui_port_33:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level:
+      network.outpoing.packets_cmaui_port_32:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.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
-      memory.usage_server_cmaui_test_nested4Level:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_42_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_cmaui_port_2_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outpoing.packets_cmaui_port_43_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.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
-      network.incoming.packets_cmaui_port_2_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_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
-      network.incoming.bytes.rate_cmaui_port_2:
+      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
-      network.incoming.bytes.rate_cmaui_port_3:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_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
-      cpu_util_server_cmaui_test_nested4Level:
+      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.allocation_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_43_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:
+      network.incoming.bytes_cmaui_port_43_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_cmaui_port_2:
+      network.outgoing.bytes_cmaui_port_42_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_cmaui_port_3:
+      disk.latency_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3912,40 +3912,40 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_3:
+    - dependency_cmaui_port_43:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_3:
+    - link_cmaui_port_43:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_42:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_2:
+    - link_cmaui_port_42:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         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
@@ -3953,373 +3953,373 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      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.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
-      network.incoming.packets.rate_cmaui_port_2:
+      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
-      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.
+      feature_cmaui_port_42:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_43:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_42:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
-        type: tosca.capabilities.Node
+      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.write.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
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      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
-      network.outgoing.bytes_cmaui_port_3:
+      network.incoming.bytes_cmaui_port_43:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets_cmaui_port_42:
         type: org.openecomp.capabilities.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:
+      network.incoming.packets_cmaui_port_43:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.incoming.bytes_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      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.usage_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
-      network.outgoing.packets.rate_cmaui_port_3:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.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.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_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.requests_server_cmaui:
+      network.outgoing.bytes_cmaui_port_42:
         type: org.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:
+      network.outgoing.bytes_cmaui_port_43:
         type: org.openecomp.capabilities.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
-      network.incoming.packets_cmaui_port_3:
+      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
-      network.incoming.packets_cmaui_port_2:
+      cpu_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_43:
         type: org.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.packets.rate_cmaui_port_43:
         type: org.openecomp.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:
+      binding_cmaui_port_43:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      network.incoming.packets.rate_cmaui_port_42:
         type: org.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.packets.rate_cmaui_port_42:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_2:
+      binding_cmaui_port_42:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      vcpus_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:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_3:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      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:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      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.incoming.bytes.rate_cmaui_port_3:
+      network.outpoing.packets_cmaui_port_43:
         type: org.openecomp.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:
+      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.outpoing.packets_cmaui_port_42:
         type: org.openecomp.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.outpoing.packets_cmaui_port_2:
+      feature_cmaui_port_43:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.outpoing.packets_cmaui_port_3:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      network.incoming.bytes.rate_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      network.incoming.bytes.rate_cmaui_port_43:
         type: org.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:
+      network.outgoing.bytes.rate_cmaui_port_42:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_3:
+      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:
+      network.outgoing.bytes.rate_cmaui_port_43:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 04b5a53..3989a1d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -63,27 +63,27 @@ topology_template:
         shared_test_net:
           get_input: shared_test_net
       requirements:
-      - link_cmaui_port_2_test_nested2Level:
+      - link_cmaui_port_21_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
-          node: test_contrailV2_net
+          node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_22_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
-          node: test_net
+          node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_32_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_1_test_nested2Level:
+      - link_cmaui_port_33_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
@@ -119,11 +119,11 @@ topology_template:
         shared_test_net:
           get_input: shared_test_contrail_net
       requirements:
-      - link_cmaui_port_3_test_nested4Level:
+      - link_cmaui_port_32:
           capability: tosca.capabilities.network.Linkable
           node: test_contrail_net
           relationship: tosca.relationships.network.LinksTo
-      - link_cmaui_port_2:
+      - link_cmaui_port_43_test_nested4Level:
           capability: tosca.capabilities.network.Linkable
           node: test_contrail_net
           relationship: tosca.relationships.network.LinksTo

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0a3ffe6..3395b33 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -56,7 +56,7 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -105,7 +105,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
@@ -114,820 +114,820 @@ topology_template:
         heat_file: ../Artifacts/nested1.yml
         description: nested1
       members:
-      - server_cmaui
+      - server_cmaui_1
       - test_nested2Level
       - cmaui_port_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_2_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_2
-      network.incoming.bytes_cmaui_port_2_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_3_test_nested3Level
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      network.outpoing.packets_cmaui_port_33_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:
+      - network.outpoing.packets_cmaui_port_33_test_nested3Level
+      feature_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes_cmaui_port_1_test_nested2Level:
+      - feature_cmaui_port_32_test_nested3Level
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_1
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - scalable_server_cmaui_3_test_nested3Level
+      network.incoming.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_22
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      - network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.bytes
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      network.incoming.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_32_test_nested3Level
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_3_test_nested3Level
+      network.incoming.packets_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_21
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
+      network.outpoing.packets_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_32_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_2
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_2
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_cmaui_2
+      feature_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - feature_cmaui_port_33_test_nested3Level
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      network.incoming.bytes_cmaui_port_3_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
-      - network.incoming.bytes_cmaui_port_3_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_22
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_0:
       - cmaui_port_0
       - binding
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_3_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_42_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_21
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
+      network.incoming.bytes.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_21
       network.incoming.bytes_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.bytes
-      network.incoming.bytes.rate_cmaui_port_1_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_1
-      network.outpoing.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_3_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      - feature_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets.rate_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_2
+      binding_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_cmaui_port_33_test_nested3Level
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
       feature_cmaui_port_0:
       - cmaui_port_0
       - feature
-      disk.device.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_1
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_3_test_nested3Level_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
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested3Level
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - attachment_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_2
-      binding_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_2
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      feature_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      - feature_cmaui_port_21
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_2_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.usage_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_2
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_33_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level
-      disk.write.bytes.rate_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.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_32_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - os_server_cmaui_2
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_2_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.iops_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_2_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_2
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2
-      memory_server_cmaui_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui
-      network.outgoing.bytes_cmaui_port_1_test_nested2Level:
+      - memory_server_cmaui_3_test_nested3Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_1
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
+      attachment_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2_test_nested4Level_test_nested3Level
+      - attachment_cmaui_port_33_test_nested3Level
       network.outpoing.packets_cmaui_port_0:
       - cmaui_port_0
       - network.outpoing.packets
-      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:
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level_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
-      network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_1
-      cpu.delta_server_cmaui:
-      - server_cmaui
+      - network.incoming.bytes.rate_cmaui_port_22
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
       - cpu.delta
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes_cmaui_port_2
-      disk.write.requests_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu_util_server_cmaui_2
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      network.outgoing.bytes_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_22
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      network.outpoing.packets_cmaui_port_1_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_1
-      cpu.delta_server_cmaui_test_nested4Level_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
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_21
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_3_test_nested4Level_test_nested3Level
-      binding_cmaui_port_1_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_1
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_21
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - network.incoming.bytes_cmaui_port_33_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_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.device.write.bytes.rate_server_cmaui
-      attachment_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_2_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - attachment_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      attachment_cmaui_port_1_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_22
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_1
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_4_test_nested4Level_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:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      network.incoming.packets.rate_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_21
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.bytes.rate_cmaui_port_1
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.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:
+      - disk.allocation_server_cmaui_2
+      network.incoming.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_cmaui_port_32_test_nested3Level
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      attachment_cmaui_port_2_test_nested2Level:
-      - test_nested2Level
-      - attachment_cmaui_port_2
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
-      feature_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_3_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
-      - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_33_test_nested3Level
+      attachment_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level
-      feature_cmaui_port_2_test_nested2Level:
+      - attachment_cmaui_port_22
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_2
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_2
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_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
-      - vcpus_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.iops_server_cmaui_test_nested2Level:
+      - feature_cmaui_port_42_test_nested4Level_test_nested3Level
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui
-      binding_cmaui_port_2_test_nested2Level:
+      - network.outgoing.bytes_cmaui_port_32_test_nested3Level
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2
+      - network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.bytes.rate
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_32_test_nested3Level
+      network.outpoing.packets_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_21
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_cmaui_port_43_test_nested4Level_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.bytes.rate_cmaui_port_22
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      network.outpoing.packets_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.outpoing.packets_cmaui_port_22
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_2_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_22_test_nested2Level:
+      - test_nested2Level
+      - binding_cmaui_port_22
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
+      network.outgoing.bytes.rate_cmaui_port_21_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.bytes.rate_cmaui_port_21
       network.outgoing.packets.rate_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.packets.rate
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
       attachment_cmaui_port_0:
       - cmaui_port_0
       - attachment
-      network.outpoing.packets_cmaui_port_2_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outpoing.packets_cmaui_port_2_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_21
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.packets.rate_cmaui_port_33_test_nested3Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_2_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
+      attachment_cmaui_port_21_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:
+      - attachment_cmaui_port_21
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      binding_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets.rate_cmaui_port_3_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_32_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_2
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_3_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
-      network.incoming.packets_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_3_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_2
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
-      attachment_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - attachment_cmaui_port_3_test_nested3Level
-      disk.device.write.requests_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
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
+      binding_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - binding_server_cmaui_2
+      feature_cmaui_port_22_test_nested2Level:
+      - test_nested2Level
+      - feature_cmaui_port_22
+      network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.bytes.rate_cmaui_port_42_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.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      attachment_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - attachment_cmaui_port_32_test_nested3Level
+      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
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.incoming.bytes.rate_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.outgoing.packets.rate_cmaui_port_32_test_nested3Level
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - network.incoming.bytes.rate_cmaui_port_33_test_nested3Level
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
-      binding_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_cmaui_port_3_test_nested3Level
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
+      network.outgoing.packets.rate_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested3Level
-      feature_cmaui_port_1_test_nested2Level:
+      - network.outgoing.packets.rate_cmaui_port_22
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_cmaui_port_1
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested3Level
-      network.incoming.packets_cmaui_port_1_test_nested2Level:
+      - network.incoming.packets_cmaui_port_33_test_nested3Level
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - network.incoming.packets_cmaui_port_1
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      dependency_cmaui_port_2_test_nested2Level:
+      local_storage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2
+      - local_storage_server_cmaui_2
       dependency_test_nested2Level:
       - test_nested2Level
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
       - link
-      link_cmaui_port_3_test_nested3Level_test_nested2Level:
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      link_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_3_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_32_test_nested3Level
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
-      link_cmaui_port_2_test_nested2Level:
+      - local_storage_server_cmaui_3_test_nested3Level
+      link_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_43_test_nested4Level_test_nested3Level
+      binding_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_3_test_nested4Level_test_nested3Level
-      dependency_cmaui_port_3_test_nested3Level_test_nested2Level:
+      - binding_cmaui_port_22
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_3_test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       dependency_cmaui_port_0:
       - cmaui_port_0
       - dependency
-      dependency_server_cmaui_test_nested2Level:
+      link_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui
-      dependency_cmaui_port_2_test_nested3Level_test_nested2Level:
+      - link_cmaui_port_21
+      dependency_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2_test_nested3Level
-      link_cmaui_port_3_test_nested4Level_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_33_test_nested3Level
+      dependency_cmaui_port_21_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_3_test_nested4Level_test_nested3Level
-      link_cmaui_port_1_test_nested2Level:
+      - dependency_cmaui_port_21
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_1
-      dependency_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_2_test_nested4Level_test_nested3Level
-      link_cmaui_port_2_test_nested4Level_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      dependency_cmaui_port_43_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2_test_nested4Level_test_nested3Level
-      binding_cmaui_port_2_test_nested2Level:
-      - test_nested2Level
-      - binding_cmaui_port_2
-      local_storage_server_cmaui:
-      - server_cmaui
+      - dependency_cmaui_port_43_test_nested4Level_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
       - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      dependency_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_cmaui_port_42_test_nested4Level_test_nested3Level
+      dependency_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_22
+      dependency_cmaui_port_32_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_cmaui_port_32_test_nested3Level
+      link_cmaui_port_22_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - link_cmaui_port_22
       dependency_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested4Level_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
-      link_cmaui_port_2_test_nested3Level_test_nested2Level:
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
+      link_cmaui_port_42_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - link_cmaui_port_2_test_nested3Level
-      dependency_cmaui_port_1_test_nested2Level:
+      - link_cmaui_port_42_test_nested4Level_test_nested3Level
+      link_cmaui_port_33_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_1
\ No newline at end of file
+      - link_cmaui_port_33_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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index bd0c372..3c8d24f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -56,7 +56,7 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    cmaui_port_2:
+    cmaui_port_21:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -77,26 +77,13 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: p2
-    test_nested3Level:
-      type: org.openecomp.resource.abstract.nodes.heat.nested3
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: nested3ServiceTemplate.yaml
-          count: 3
-          mandatory: true
-        p2:
-          get_input: shared_test_net
-        indx:
-          get_property:
-          - SELF
-          - service_template_filter
-          - index_value
-        shared_test_net:
           get_input: shared_test_net
-    server_cmaui:
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_cmaui_2
+          relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -109,7 +96,7 @@ topology_template:
           get_input:
           - cmaui_names
           - 0
-    cmaui_port_1:
+    cmaui_port_22:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -130,12 +117,25 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
+          get_input: p2
+    test_nested3Level:
+      type: org.openecomp.resource.abstract.nodes.heat.nested3
+      directives:
+      - substitutable
+      properties:
+        service_template_filter:
+          substitute_service_template: nested3ServiceTemplate.yaml
+          count: 3
+          mandatory: true
+        p2:
+          get_input: shared_test_net
+        indx:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+        shared_test_net:
           get_input: shared_test_net
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -143,647 +143,647 @@ topology_template:
         heat_file: ../Artifacts/nested2.yml
         description: nested2
       members:
-      - cmaui_port_2
+      - cmaui_port_21
+      - server_cmaui_2
+      - cmaui_port_22
       - test_nested3Level
-      - server_cmaui
-      - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      network.outgoing.bytes_cmaui_port_3_test_nested3Level:
+      - feature_cmaui_port_42_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_3
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      network.incoming.packets_cmaui_port_3_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      network.outpoing.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_3
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_43_test_nested4Level
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_2_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
+      network.incoming.packets.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets.rate
+      network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_2
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_42_test_nested4Level
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_3
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.bytes.rate_server_cmaui_3
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      binding_cmaui_port_2_test_nested3Level:
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_2
-      disk.device.read.bytes.rate_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
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
-      feature_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_33
+      feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_3_test_nested4Level
-      network.incoming.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - feature_test_nested4Level
+      network.outpoing.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_3_test_nested4Level
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.incoming.bytes_cmaui_port_2_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_32
+      feature_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_2
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_43_test_nested4Level
+      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
-      - instance_server_cmaui_test_nested4Level
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_3_test_nested4Level
-      disk.device.capacity_server_cmaui_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
-      - disk.device.capacity_server_cmaui
-      feature_test_nested4Level_test_nested3Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level
+      network.incoming.bytes.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_3_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_42_test_nested4Level
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes
+      network.incoming.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_3
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_32
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_2_test_nested4Level
-      network.outgoing.bytes_cmaui_port_2_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      network.incoming.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes.rate
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_2
-      feature_server_cmaui_test_nested3Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
-      memory.usage_server_cmaui_test_nested3Level:
+      - network.incoming.bytes_cmaui_port_43_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      feature_cmaui_port_3_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes.rate
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_3
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      - 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
-      - binding_server_cmaui
-      binding_cmaui_port_3_test_nested3Level:
+      - host_server_cmaui_3
+      attachment_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_3
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_43_test_nested4Level
+      disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
-      feature_cmaui_port_2_test_nested3Level:
+      - disk.allocation_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_2
-      network.outgoing.packets.rate_cmaui_port_2_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_43_test_nested4Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      network.incoming.packets_cmaui_port_2_test_nested3Level:
+      - memory_server_cmaui_4_test_nested4Level
+      network.outpoing.packets_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_2
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      feature_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_33
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_cmaui_port_2_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_43_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      attachment_cmaui_port_3_test_nested3Level:
+      - disk.write.requests_server_cmaui_3
+      binding_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - binding_cmaui_port_42_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outgoing.packets.rate_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
-      cpu_util_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_33
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      network.incoming.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu_util_server_cmaui
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes_cmaui_port_42_test_nested4Level
+      network.outgoing.bytes_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_32
+      binding_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_33
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      network.incoming.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_2_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      binding_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_43_test_nested4Level
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_42_test_nested4Level
+      memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory_server_cmaui_3
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      - feature_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes
+      feature_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_32
+      network.incoming.packets.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_32
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.root.size_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes
+      disk.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      network.incoming.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_3_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level_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
-      - network.incoming.packets.rate_cmaui_port_3_test_nested4Level
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
-      cpu_server_cmaui_test_nested4Level_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
+      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
-      network.incoming.bytes.rate_cmaui_port_2_test_nested3Level:
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      attachment_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      feature_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_3_test_nested4Level
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - feature_cmaui_port_33
+      network.outgoing.packets.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.packets.rate
+      binding_cmaui_port_22:
+      - cmaui_port_22
+      - binding
+      disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_2_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.iops_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_2_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_3_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_43_test_nested4Level
+      cpu_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_3
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      - 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.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_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
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      network.outgoing.packets.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.packets.rate
+      binding_cmaui_port_21:
+      - cmaui_port_21
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_3_test_nested4Level
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      network.outpoing.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - instance_server_cmaui_3
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_2_test_nested4Level
-      disk.write.requests.rate_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.write.requests.rate_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
-      disk.iops_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_42_test_nested4Level
+      attachment_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
+      - attachment_cmaui_port_33
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      - disk.device.read.bytes.rate_server_cmaui_3
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      network.outgoing.bytes.rate_cmaui_port_22:
+      - cmaui_port_22
+      - network.outgoing.bytes.rate
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.resident_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      - network.incoming.bytes_cmaui_port_33
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_3_test_nested4Level
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.usage_server_cmaui_3
+      network.outpoing.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.outpoing.packets
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      - disk.write.bytes_server_cmaui_3
+      network.outpoing.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.outpoing.packets
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - feature_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      network.incoming.bytes.rate_cmaui_port_3_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_3
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_2_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      feature_cmaui_port_22:
+      - cmaui_port_22
+      - feature
+      feature_cmaui_port_21:
+      - cmaui_port_21
+      - feature
+      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:
+      - scalable_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
-      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:
+      - network.incoming.bytes_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_21:
+      - cmaui_port_21
+      - network.outgoing.bytes.rate
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_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:
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.allocation_server_cmaui_3
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      network.outpoing.packets_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.outpoing.packets_cmaui_port_3_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_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:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.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.requests.rate_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_3_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      network.outgoing.bytes_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_3
-      disk.capacity_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes_cmaui_port_33
+      network.incoming.bytes.rate_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      binding_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_43_test_nested4Level
+      attachment_cmaui_port_21:
+      - cmaui_port_21
+      - attachment
+      network.incoming.packets_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_3_test_nested4Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_43_test_nested4Level
+      attachment_cmaui_port_22:
+      - cmaui_port_22
+      - attachment
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      network.incoming.bytes_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.bytes
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      attachment_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - network.incoming.bytes.rate_cmaui_port_42_test_nested4Level
+      network.incoming.packets_cmaui_port_21:
+      - cmaui_port_21
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_22:
+      - cmaui_port_22
+      - network.incoming.bytes
+      endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_2_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      instance_server_cmaui_test_nested3Level:
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2_test_nested3Level:
+      - vcpus_server_cmaui_3
+      network.outpoing.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_2
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.outpoing.packets_cmaui_port_42_test_nested4Level
+      disk.allocation_server_cmaui_4_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
-      network.incoming.bytes_cmaui_port_3_test_nested3Level:
+      - disk.allocation_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.incoming.bytes_cmaui_port_3
-      cpu_server_cmaui_test_nested3Level:
+      - binding_cmaui_port_32
+      network.outgoing.bytes.rate_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
+      - network.outgoing.bytes.rate_cmaui_port_32
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui
-      network.incoming.packets_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.write.bytes_server_cmaui_3
+      network.incoming.packets.rate_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - network.incoming.packets_cmaui_port_2_test_nested4Level
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      - network.incoming.packets.rate_cmaui_port_33
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      attachment_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
-      attachment_cmaui_port_2_test_nested3Level:
+      - attachment_cmaui_port_42_test_nested4Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_2
-      scalable_server_cmaui_test_nested3Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
-      disk.device.iops_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
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      - binding_server_cmaui_4_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      attachment_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_32
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested3Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - network.incoming.packets_cmaui_port_32
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
-      binding_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - binding_cmaui_port_2_test_nested4Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests_server_cmaui_3
+      network.incoming.packets_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
-    requirements:
-      dependency_server_cmaui_test_nested3Level:
+      - network.incoming.packets_cmaui_port_42_test_nested4Level
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      dependency_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - disk.ephemeral.size_server_cmaui_3
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_3_test_nested4Level
-      link_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_2_test_nested4Level
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      link_cmaui_port_2_test_nested3Level:
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_2_test_nested4Level_test_nested3Level:
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
+    requirements:
+      dependency_cmaui_port_42_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_2_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+      - dependency_cmaui_port_42_test_nested4Level
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
-      dependency_cmaui_port_3_test_nested3Level:
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_3
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
+      - local_storage_server_cmaui_3
+      link_cmaui_port_42_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_42_test_nested4Level
+      dependency_cmaui_port_43_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_cmaui_port_43_test_nested4Level
+      binding_cmaui_port_22:
+      - cmaui_port_22
+      - binding
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_cmaui_port_33_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
-      link_cmaui_port_3_test_nested3Level:
+      - dependency_cmaui_port_33
+      link_cmaui_port_22:
+      - cmaui_port_22
+      - link
+      dependency_cmaui_port_21:
+      - cmaui_port_21
+      - dependency
+      link_cmaui_port_21:
+      - cmaui_port_21
+      - link
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_3
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      - dependency_server_cmaui_3
+      dependency_cmaui_port_22:
+      - cmaui_port_22
       - dependency
-      dependency_cmaui_port_2_test_nested3Level:
+      link_cmaui_port_33_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_33
+      link_cmaui_port_32_test_nested3Level:
+      - test_nested3Level
+      - link_cmaui_port_32
+      link_cmaui_port_43_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_2
-      link_cmaui_port_3_test_nested4Level_test_nested3Level:
+      - link_cmaui_port_43_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - link_cmaui_port_3_test_nested4Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_server_cmaui_2:
+      - server_cmaui_2
       - dependency
-      local_storage_server_cmaui_test_nested3Level:
+      dependency_cmaui_port_32_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_32
\ 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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 3b60bb0..1b5d69b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -59,7 +59,7 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    cmaui_port_3:
+    cmaui_port_32:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -80,11 +80,11 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: p2
+          get_input: shared_test_net
       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
@@ -97,7 +97,20 @@ topology_template:
           get_input: p2
         shared_test_net:
           get_input: shared_test_net
-    cmaui_port_2:
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
+    cmaui_port_33:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -118,25 +131,12 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: shared_test_net
+          get_input: p2
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -144,431 +144,431 @@ topology_template:
         heat_file: ../Artifacts/nested3.yml
         description: nested3
       members:
-      - cmaui_port_3
+      - cmaui_port_32
       - test_nested4Level
-      - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_3
+      - cmaui_port_33
   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
-      binding_cmaui_port_2_test_nested4Level:
-      - test_nested4Level
-      - binding_cmaui_port_2
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      network.incoming.bytes_cmaui_port_2_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes_cmaui_port_2
-      memory_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      network.outpoing.packets_cmaui_port_3_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      attachment_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - network.outpoing.packets_cmaui_port_3
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
+      - attachment_cmaui_port_42
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      network.incoming.bytes.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.bytes.rate
+      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
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      network.outpoing.packets_cmaui_port_2_test_nested4Level:
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      network.outgoing.bytes.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.outpoing.packets_cmaui_port_2
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      feature_cmaui_port_2_test_nested4Level:
+      - network.outgoing.bytes.rate_cmaui_port_43
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      feature_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - feature_cmaui_port_2
-      cpu_server_cmaui_test_nested4Level:
+      - feature_cmaui_port_42
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
+      binding_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - binding_cmaui_port_43
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      network.outgoing.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes
-      network.incoming.bytes_cmaui_port_3_test_nested4Level:
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
+      attachment_cmaui_port_32:
+      - cmaui_port_32
+      - attachment
+      attachment_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes_cmaui_port_3
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.bytes.rate_cmaui_port_2_test_nested4Level:
+      - attachment_cmaui_port_43
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes.rate_cmaui_port_2
-      attachment_cmaui_port_2_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      attachment_cmaui_port_33:
+      - cmaui_port_33
+      - attachment
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - attachment_cmaui_port_2
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      - disk.device.read.requests_server_cmaui_4
+      network.outgoing.bytes.rate_cmaui_port_42_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:
+      - network.outgoing.bytes.rate_cmaui_port_42
+      network.incoming.packets.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.packets.rate
+      disk.device.write.requests_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.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
-      - host_server_cmaui
-      network.outgoing.bytes.rate_cmaui_port_3_test_nested4Level:
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes.rate_cmaui_port_3
-      attachment_cmaui_port_3_test_nested4Level:
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      binding_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - attachment_cmaui_port_3
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      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:
+      - binding_cmaui_port_42
+      feature_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level:
+      - feature_cmaui_port_43
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      - binding_server_cmaui_4
+      os_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2_test_nested4Level:
+      - os_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets.rate_cmaui_port_2
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      - cpu.delta_server_cmaui_4
+      network.incoming.bytes_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - network.incoming.bytes_cmaui_port_42
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.capacity_server_cmaui_4
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      network.outpoing.packets_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
+      - network.outpoing.packets_cmaui_port_42
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - binding_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      binding_cmaui_port_3:
-      - cmaui_port_3
-      - binding
-      network.outgoing.bytes_cmaui_port_3_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_3
-      binding_cmaui_port_3_test_nested4Level:
+      - endpoint_server_cmaui_4
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - binding_cmaui_port_3
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes.rate
-      feature_server_cmaui_test_nested4Level:
+      - vcpus_server_cmaui_4
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
       - disk.iops
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
-      network.outgoing.packets.rate_cmaui_port_3_test_nested4Level:
-      - test_nested4Level
-      - network.outgoing.packets.rate_cmaui_port_3
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      feature_cmaui_port_3_test_nested4Level:
-      - test_nested4Level
-      - feature_cmaui_port_3
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      network.incoming.packets_cmaui_port_3_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets_cmaui_port_3
-      scalable_server_cmaui_test_nested4Level:
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
+      network.outgoing.bytes.rate_cmaui_port_33:
+      - cmaui_port_33
+      - network.outgoing.bytes.rate
+      network.incoming.packets_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_3_test_nested4Level:
+      - network.incoming.packets_cmaui_port_42
+      network.incoming.bytes.rate_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes.rate_cmaui_port_3
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      - network.incoming.bytes.rate_cmaui_port_42
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
-      disk.device.allocation_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.device.allocation_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested4Level:
+      - cpu_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      - network.outgoing.packets.rate_cmaui_port_43
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
+      network.outgoing.bytes_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.bytes
+      feature_cmaui_port_33:
+      - cmaui_port_33
       - feature
-      feature_cmaui_port_3:
-      - cmaui_port_3
+      feature_cmaui_port_32:
+      - cmaui_port_32
       - feature
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
+      - network.outgoing.bytes_cmaui_port_43
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
+      network.outgoing.bytes_cmaui_port_33:
+      - cmaui_port_33
+      - network.outgoing.bytes
+      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
-      attachment_cmaui_port_2:
-      - cmaui_port_2
-      - attachment
-      attachment_cmaui_port_3:
-      - cmaui_port_3
-      - attachment
-      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
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      - instance_server_cmaui_4
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
+      network.outgoing.packets.rate_cmaui_port_42_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.packets.rate_cmaui_port_42
+      network.outgoing.bytes.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.bytes.rate
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
       - disk.usage
-      network.outgoing.packets.rate_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_33:
+      - cmaui_port_33
       - network.outgoing.packets.rate
-      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
-      network.incoming.packets.rate_cmaui_port_3_test_nested4Level:
+      binding_cmaui_port_33:
+      - cmaui_port_33
+      - binding
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets.rate_cmaui_port_3
-      disk.iops_server_cmaui_test_nested4Level:
+      - memory_server_cmaui_4
+      network.incoming.packets.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      endpoint_server_cmaui_test_nested4Level:
+      - network.incoming.packets.rate_cmaui_port_43
+      network.incoming.packets_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
+      - network.incoming.packets_cmaui_port_43
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      - disk.root.size_server_cmaui_4
+      network.outgoing.packets.rate_cmaui_port_32:
+      - cmaui_port_32
+      - network.outgoing.packets.rate
+      binding_cmaui_port_32:
+      - cmaui_port_32
+      - binding
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
-      network.incoming.bytes.rate_cmaui_port_2_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      network.incoming.bytes_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.bytes
+      disk.device.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.incoming.bytes.rate_cmaui_port_2
-      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.read.bytes_server_cmaui_test_nested4Level:
+      - disk.device.latency_server_cmaui_4
+      network.incoming.packets_cmaui_port_32:
+      - cmaui_port_32
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.packets
+      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.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.ephemeral.size_server_cmaui_4
+      network.incoming.bytes_cmaui_port_33:
+      - cmaui_port_33
+      - network.incoming.bytes
+      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.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.allocation_server_cmaui_4
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      network.outpoing.packets_cmaui_port_33:
+      - cmaui_port_33
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_32:
+      - cmaui_port_32
+      - network.outpoing.packets
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - os_server_cmaui
-      network.outgoing.bytes_cmaui_port_2_test_nested4Level:
+      - network.incoming.packets.rate_cmaui_port_42
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
+      network.outpoing.packets_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_2
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      memory.usage_server_cmaui_test_nested4Level:
+      - network.outpoing.packets_cmaui_port_43
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.usage_server_cmaui
-      network.outgoing.packets.rate_cmaui_port_2_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.packets.rate_cmaui_port_2
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      network.incoming.packets_cmaui_port_2_test_nested4Level:
+      - disk.device.read.bytes.rate_server_cmaui_4
+      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.rate_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - network.incoming.packets_cmaui_port_2
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes.rate
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      - network.incoming.bytes.rate_cmaui_port_43
+      network.incoming.bytes_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - network.incoming.bytes_cmaui_port_43
+      network.outgoing.bytes_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - network.outgoing.bytes_cmaui_port_42
+      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
-      link_cmaui_port_3_test_nested4Level:
+      link_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - link_cmaui_port_3
-      local_storage_server_cmaui_test_nested4Level:
+      - link_cmaui_port_42
+      dependency_cmaui_port_42_test_nested4Level:
       - test_nested4Level
-      - local_storage_server_cmaui
-      link_cmaui_port_2:
-      - cmaui_port_2
-      - link
-      link_cmaui_port_3:
-      - cmaui_port_3
-      - link
-      dependency_cmaui_port_2_test_nested4Level:
+      - dependency_cmaui_port_42
+      local_storage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - dependency_cmaui_port_2
+      - local_storage_server_cmaui_4
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       dependency_test_nested4Level:
       - test_nested4Level
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
+      link_cmaui_port_33:
+      - cmaui_port_33
+      - link
+      dependency_cmaui_port_32:
+      - cmaui_port_32
+      - dependency
+      link_cmaui_port_32:
+      - cmaui_port_32
+      - link
+      dependency_cmaui_port_33:
+      - cmaui_port_33
+      - dependency
+      link_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - dependency_server_cmaui
-      dependency_cmaui_port_3_test_nested4Level:
+      - link_cmaui_port_43
+      dependency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - dependency_cmaui_port_3
-      dependency_cmaui_port_3:
-      - cmaui_port_3
-      - dependency
-      link_cmaui_port_2_test_nested4Level:
+      - dependency_server_cmaui_4
+      dependency_cmaui_port_43_test_nested4Level:
       - test_nested4Level
-      - link_cmaui_port_2
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      - dependency_cmaui_port_43
+      dependency_server_cmaui_3:
+      - server_cmaui_3
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 9b6b5ff..517bd40 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -55,7 +55,7 @@ topology_template:
       type: string
       description: UID of OAM network
   node_templates:
-    cmaui_port_3:
+    cmaui_port_43:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -80,9 +80,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    cmaui_port_2:
+    cmaui_port_42:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -107,9 +107,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:
@@ -129,217 +129,217 @@ topology_template:
         heat_file: ../Artifacts/nested4.yml
         description: nested4
       members:
-      - cmaui_port_3
-      - cmaui_port_2
-      - server_cmaui
+      - cmaui_port_43
+      - cmaui_port_42
+      - 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
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      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
-      feature_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
+      feature_cmaui_port_42:
+      - cmaui_port_42
       - feature
-      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
-      attachment_cmaui_port_2:
-      - cmaui_port_2
+      attachment_cmaui_port_43:
+      - cmaui_port_43
       - attachment
-      attachment_cmaui_port_3:
-      - cmaui_port_3
+      attachment_cmaui_port_42:
+      - cmaui_port_42
       - attachment
-      network.outgoing.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
       - disk.read.requests
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.packets.rate
-      disk.usage_server_cmaui:
-      - server_cmaui
+      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
+      network.incoming.bytes_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.bytes
+      network.incoming.packets_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.packets
+      network.incoming.packets_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.bytes
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      network.outgoing.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
+      network.outgoing.bytes_cmaui_port_42:
+      - cmaui_port_42
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_43:
+      - cmaui_port_43
+      - network.outgoing.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.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.device.read.bytes_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
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
+      network.incoming.packets.rate_cmaui_port_43:
+      - cmaui_port_43
+      - network.incoming.packets.rate
+      network.outgoing.packets.rate_cmaui_port_43:
+      - cmaui_port_43
+      - network.outgoing.packets.rate
+      binding_cmaui_port_43:
+      - cmaui_port_43
+      - binding
+      network.incoming.packets.rate_cmaui_port_42:
+      - cmaui_port_42
+      - network.incoming.packets.rate
+      network.outgoing.packets.rate_cmaui_port_42:
+      - cmaui_port_42
+      - network.outgoing.packets.rate
+      binding_cmaui_port_42:
+      - cmaui_port_42
       - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
+      network.outpoing.packets_cmaui_port_43:
+      - cmaui_port_43
+      - network.outpoing.packets
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
       - disk.device.read.requests.rate
-      network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      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
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
+      network.outpoing.packets_cmaui_port_42:
+      - cmaui_port_42
+      - network.outpoing.packets
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      feature_cmaui_port_43:
+      - cmaui_port_43
       - feature
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      binding_cmaui_port_3:
-      - cmaui_port_3
-      - binding
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.ephemeral.size
+      network.incoming.bytes.rate_cmaui_port_42:
+      - cmaui_port_42
       - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
+      network.incoming.bytes.rate_cmaui_port_43:
+      - cmaui_port_43
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
+      network.outgoing.bytes.rate_cmaui_port_42:
+      - cmaui_port_42
       - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_43:
+      - cmaui_port_43
       - network.outgoing.bytes.rate
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      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
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      link_cmaui_port_2:
-      - cmaui_port_2
+      link_cmaui_port_42:
+      - cmaui_port_42
       - link
-      dependency_cmaui_port_3:
-      - cmaui_port_3
+      dependency_server_cmaui_4:
+      - server_cmaui_4
+      - dependency
+      dependency_cmaui_port_42:
+      - cmaui_port_42
+      - dependency
+      dependency_cmaui_port_43:
+      - cmaui_port_43
       - dependency
-      link_cmaui_port_3:
-      - cmaui_port_3
+      link_cmaui_port_43:
+      - cmaui_port_43
       - link
-      dependency_cmaui_port_2:
-      - cmaui_port_2
-      - dependency
\ No newline at end of file
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
index 878b77e..4d74184 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
@@ -37,7 +37,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
index 7e08f5c..258c76f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
@@ -29,7 +29,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_1:
+  cmaui_port_21:
     type: OS::Neutron::Port
     properties:
       network: { get_param: shared_test_net }
@@ -37,7 +37,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_2:
+  cmaui_port_22:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -45,7 +45,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -53,7 +53,7 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_1 }
+      - port: { get_resource: cmaui_port_21 }
 
   test_nested3Level:
     type: OS::Heat::ResourceGroup

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
index 02ee8d6..d1c4aa1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
@@ -30,7 +30,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_2:
+  cmaui_port_32:
     type: OS::Neutron::Port
     properties:
       network: { get_param: shared_test_net }
@@ -38,7 +38,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_3:
+  cmaui_port_33:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -54,8 +54,8 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
-      - port: { get_resource: cmaui_port_3 }
+      - port: { get_resource: cmaui_port_32 }
+      - port: { get_resource: cmaui_port_33 }
 
   test_nested4Level:
     type: nested4.yml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
index dcc60e1..00605c0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
@@ -28,7 +28,7 @@ parameters:
       type: string
 resources:
 
-  cmaui_port_2:
+  cmaui_port_42:
     type: OS::Neutron::Port
     properties:
       network: { get_param: p2 }
@@ -36,7 +36,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  cmaui_port_3:
+  cmaui_port_43:
     type: OS::Neutron::Port
     properties:
       network: { get_param: shared_test_net }
@@ -44,7 +44,7 @@ resources:
       security_groups: [{get_param: security_group_name}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
@@ -52,5 +52,5 @@ resources:
       availability_zone: { get_param: availability_zone_0 }
       flavor: { get_param: cmaui_flavor }
       networks:
-      - port: { get_resource: cmaui_port_2 }
-      - port: { get_resource: cmaui_port_3 }
\ No newline at end of file
+      - port: { get_resource: cmaui_port_42 }
+      - port: { get_resource: cmaui_port_43 }
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b2eb38f..e73e81a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,14 +69,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -103,6 +103,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -143,6 +157,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -156,14 +184,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -196,34 +224,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -238,24 +238,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -274,39 +257,38 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -316,8 +298,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.requests_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -334,73 +317,89 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested2Level:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -418,7 +417,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -441,12 +452,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -459,52 +465,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -522,35 +513,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -565,58 +545,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -634,49 +604,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -698,274 +668,252 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested2Level:
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -981,59 +929,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1044,7 +975,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1055,47 +986,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1107,61 +1033,66 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      disk.capacity_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.write.bytes.rate_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
-      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      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
-      disk.device.read.bytes_server_cmaui:
+      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:
@@ -1173,43 +1104,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      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.latency_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_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_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.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_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:
@@ -1221,91 +1152,77 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_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
-      network.incoming.packets_cmaui_port_1:
+      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
-      disk.device.read.bytes_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.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_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
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_4_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1313,36 +1230,36 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1353,19 +1270,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1382,142 +1299,140 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2Level:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1529,30 +1444,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1574,19 +1495,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_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
-      memory.resident_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1598,25 +1531,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1630,37 +1580,49 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1684,13 +1646,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1706,13 +1680,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1724,18 +1710,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_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.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1805,6 +1805,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1845,6 +1859,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1858,14 +1886,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1898,161 +1926,109 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
+      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:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_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
-      disk.device.allocation_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:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_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.device.capacity_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2063,26 +2039,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2091,191 +2068,191 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_4:
+      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2286,7 +2263,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      disk.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2299,24 +2276,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2332,7 +2292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2344,19 +2304,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2375,19 +2340,24 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2399,194 +2369,208 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_4:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_4:
+      disk.write.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_4:
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.allocation_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2598,41 +2582,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2646,39 +2636,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2688,217 +2681,193 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
+      host_server_cmaui_2:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2923,49 +2892,61 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      network.outpoing.packets_cmaui_port_3:
+      disk.device.read.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2977,12 +2958,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      memory.resident_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2990,13 +2988,15 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3005,49 +3005,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      disk.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3127,6 +3127,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3140,14 +3154,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3180,174 +3194,176 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      memory.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+      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:
-        - 0
+        - 1
+        - UNBOUNDED
+      disk.device.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.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
+      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
-    capabilities:
-      cpu.delta_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
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      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_test_nested4Level:
+      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.root.size_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.write.bytes_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      cpu_server_cmaui_test_nested4Level:
+      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
-      vcpus_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level:
+      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.write.requests_server_cmaui:
+      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
-      network.incoming.bytes.rate_cmaui_port_7_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
-      instance_server_cmaui:
+      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
-      disk.latency_server_cmaui_test_nested4Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_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.capacity_server_cmaui_test_nested4Level:
+      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
-      network.incoming.bytes.rate_cmaui_port_8_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
-      disk.root.size_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      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.read.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.
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -3357,68 +3373,72 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6:
+      cpu.delta_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.incoming.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
+      disk.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -3428,17 +3448,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_5:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3459,30 +3474,31 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3512,32 +3528,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3553,20 +3571,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_5:
+      feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3575,19 +3592,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3598,12 +3603,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_8_test_nested4Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3611,19 +3610,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_5:
+      disk.write.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3634,77 +3633,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5:
+      vcpus_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_8_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_5:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_8_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3715,19 +3700,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3738,30 +3723,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6:
+      memory_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level:
+      disk.root.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3774,88 +3758,97 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.latency_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6:
+      network.incoming.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3867,19 +3860,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outgoing.bytes_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6:
+      network.outpoing.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6:
+      disk.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3891,56 +3884,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_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.read.bytes_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_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
-      network.incoming.bytes.rate_cmaui_port_5:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      cpu.delta_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level:
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      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
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4007,47 +4007,58 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_8:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_8:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_4:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_8:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_8:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4063,61 +4074,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8:
+      disk.device.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7:
+      attachment_cmaui_port_8:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4127,121 +4136,110 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      disk.device.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.device.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7:
+      disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8:
+      memory_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -4263,13 +4261,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8:
+      instance_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4281,24 +4279,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4310,7 +4297,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4329,6 +4316,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_8:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4336,44 +4329,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      cpu.delta_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory.resident_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8:
+      network.outgoing.bytes.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_8:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4383,7 +4377,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4395,13 +4389,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 42b1a26..4120554 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -85,9 +85,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -137,7 +137,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
@@ -147,105 +147,111 @@ topology_template:
         description: nested1
       members:
       - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_1
       - test_nested2Level
       - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_6_test_nested3Level
       binding_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_6_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested3Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
+      - scalable_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
       binding_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_5_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_3
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_6_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
@@ -255,129 +261,105 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_2
       binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_7_test_nested4Level_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_4
-      disk.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
       network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_5_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
@@ -387,402 +369,369 @@ topology_template:
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - os_server_cmaui_2
       network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_5_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_2
       network.incoming.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_4
       feature_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_5_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
+      - memory_server_cmaui_3_test_nested3Level
       attachment_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_3
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       feature_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
       attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_3
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
       network.outgoing.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_4
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_5_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.allocation_server_cmaui_2
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - host_server_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
       binding_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_4
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_4
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
+      - disk.device.usage_server_cmaui_2
       feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      disk.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
       attachment_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_4
-      memory.usage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_4
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
@@ -792,39 +741,51 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_3
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
+      - disk.root.size_server_cmaui_2
       feature_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_4
@@ -834,51 +795,72 @@ topology_template:
       attachment_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
+      - disk.ephemeral.size_server_cmaui_2
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_4
       binding_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_3
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_6_test_nested3Level
@@ -888,40 +870,58 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
       feature_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_6_test_nested3Level
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_3
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_3
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_5_test_nested3Level
@@ -946,42 +946,42 @@ topology_template:
       link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_7_test_nested4Level_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       dependency_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_3
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_3_test_nested3Level
       dependency_cmaui_port_1:
       - cmaui_port_1
       - dependency
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       link_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_6_test_nested3Level
-      dependency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui
       dependency_cmaui_port_2:
       - cmaui_port_2
       - dependency
       link_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_4
-      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_cmaui_port_5_test_nested3Level
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
+      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - dependency_cmaui_port_5_test_nested3Level
       link_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_3
@@ -994,9 +994,9 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_4
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index c2319a0..2d592aa 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -86,8 +86,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_4:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -113,7 +126,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
@@ -133,19 +146,6 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -154,510 +154,495 @@ topology_template:
         description: nested2
       members:
       - cmaui_port_3
+      - server_cmaui_2
       - cmaui_port_4
       - test_nested3Level
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.write.bytes.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      feature_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
-      memory.usage_server_cmaui_test_nested3Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      - host_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
+      - disk.iops_server_cmaui_4_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      host_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - host_server_cmaui_3
       network.incoming.packets_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.allocation_server_cmaui_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       network.incoming.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_6
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
-      disk.allocation_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
       feature_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
+      - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_3
       network.incoming.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
       feature_cmaui_port_3:
       - cmaui_port_3
       - feature
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets.rate
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
       feature_cmaui_port_4:
       - cmaui_port_4
       - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.packets.rate
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
+      - instance_server_cmaui_3
       attachment_cmaui_port_3:
       - cmaui_port_3
       - attachment
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      disk.iops_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      - disk.capacity_server_cmaui_4_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_5
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_3
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_3
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
+      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
       binding_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_7_test_nested4Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - disk.device.allocation_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_5
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_3
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_8_test_nested4Level
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
+      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
+      - vcpus_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      - disk.allocation_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      instance_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - instance_server_cmaui
       binding_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_5
@@ -667,91 +652,106 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_3:
       - cmaui_port_3
       - network.outpoing.packets
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
       network.outpoing.packets_cmaui_port_4:
       - cmaui_port_4
       - network.outpoing.packets
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_8_test_nested4Level
-      scalable_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_cmaui_3
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
       network.incoming.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_5
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
+      - disk.ephemeral.size_server_cmaui_3
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_5
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
       link_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_5
-      dependency_server_cmaui_test_nested3Level:
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3
       dependency_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_6
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
@@ -761,18 +761,18 @@ topology_template:
       link_cmaui_port_3:
       - cmaui_port_3
       - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       link_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_6
       link_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_8_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
@@ -782,6 +782,9 @@ topology_template:
       dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       dependency_cmaui_port_4:
       - cmaui_port_4
       - dependency
@@ -790,7 +793,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_5
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index d907a4d..9bc5ccc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -74,6 +74,19 @@ topology_template:
           substitute_service_template: nested4ServiceTemplate.yaml
         p2:
           get_input: p2
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_5:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -99,7 +112,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
     cmaui_port_6:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -126,21 +139,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -149,135 +149,144 @@ topology_template:
         description: nested3
       members:
       - test_nested4Level
+      - server_cmaui_3
       - cmaui_port_5
       - cmaui_port_6
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      memory_server_cmaui_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      cpu_server_cmaui_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      disk.root.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests.rate
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_7
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.latency_server_cmaui
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_8
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      host_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - host_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.device.read.requests_server_cmaui_4
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests.rate
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - binding_server_cmaui_4
       network.incoming.packets_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets
+      os_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - os_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_7
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - cpu.delta_server_cmaui_4
       network.incoming.packets_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_7
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outgoing.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_cmaui_port_8
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - vcpus_server_cmaui_4
       binding_cmaui_port_5:
       - cmaui_port_5
       - binding
@@ -287,21 +296,21 @@ topology_template:
       binding_cmaui_port_6:
       - cmaui_port_6
       - binding
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      feature_server_cmaui_test_nested4Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
       network.outgoing.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes.rate
@@ -314,75 +323,78 @@ topology_template:
       network.incoming.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      scalable_server_cmaui_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
       network.incoming.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_8
       network.outpoing.packets_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_8
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
       feature_cmaui_port_5:
       - cmaui_port_5
       - feature
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
       feature_cmaui_port_6:
       - cmaui_port_6
       - feature
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
+      - cpu_server_cmaui_4
       attachment_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_7
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
       binding_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_8
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets.rate
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
       attachment_cmaui_port_6:
       - cmaui_port_6
       - attachment
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_7
+      instance_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - instance_server_cmaui_4
       network.outgoing.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.packets.rate
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
       network.outgoing.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.packets.rate
@@ -392,166 +404,154 @@ topology_template:
       feature_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_8
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
       network.outpoing.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_7
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
       attachment_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_8
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.usage
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_8
-      disk.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
       feature_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_7
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
+      - disk.root.size_server_cmaui_4
       binding_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_7
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_7
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      disk.device.latency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.latency_server_cmaui_4
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.read.requests.rate_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.ephemeral.size_server_cmaui_4
+      disk.device.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.allocation
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.allocation_server_cmaui_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.bytes_cmaui_port_7
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       network.incoming.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_cmaui_port_7
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
       network.incoming.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
       network.outpoing.packets_cmaui_port_5:
       - cmaui_port_5
       - network.outpoing.packets
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
       network.outgoing.bytes_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes
       network.outpoing.packets_cmaui_port_6:
       - cmaui_port_6
       - network.outpoing.packets
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
       network.outgoing.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.bytes
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      disk.device.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests
       network.incoming.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_7
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.device.read.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_3:
+      - server_cmaui_3
+      - cpu.delta
+      memory.resident_server_cmaui_3:
+      - server_cmaui_3
+      - memory.resident
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
     requirements:
       dependency_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_7
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_cmaui_port_6:
       - cmaui_port_6
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_8
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       link_cmaui_port_6:
       - cmaui_port_6
       - link
@@ -564,15 +564,15 @@ topology_template:
       link_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_8
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_7
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 720662b..c5b92cb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -84,8 +84,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_4:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -112,21 +125,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -135,119 +135,119 @@ topology_template:
         description: nested4
       members:
       - cmaui_port_7
+      - server_cmaui_4
       - cmaui_port_8
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested4
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes
+      disk.device.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes
+      feature_server_cmaui_4:
+      - server_cmaui_4
+      - feature
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
       feature_cmaui_port_7:
       - cmaui_port_7
       - feature
       feature_cmaui_port_8:
       - cmaui_port_8
       - feature
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.requests
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
       network.outgoing.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.packets.rate
       attachment_cmaui_port_7:
       - cmaui_port_7
       - attachment
+      vcpus_server_cmaui_4:
+      - server_cmaui_4
+      - vcpus
+      binding_server_cmaui_4:
+      - server_cmaui_4
+      - binding
+      disk.root.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests.rate
       attachment_cmaui_port_8:
       - cmaui_port_8
       - attachment
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       network.outgoing.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
       network.incoming.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
       network.incoming.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.packets.rate
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.device.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes
+      memory_server_cmaui_4:
+      - server_cmaui_4
+      - memory
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
       network.incoming.packets_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets
@@ -257,53 +257,53 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes.rate
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.incoming.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.outgoing.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outpoing.packets_cmaui_port_7:
       - cmaui_port_7
       - network.outpoing.packets
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_8:
       - cmaui_port_8
       - network.outpoing.packets
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       binding_cmaui_port_7:
       - cmaui_port_7
       - binding
       network.outgoing.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       binding_cmaui_port_8:
       - cmaui_port_8
       - binding
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
       - disk.ephemeral.size
       network.outgoing.bytes.rate_cmaui_port_7:
       - cmaui_port_7
@@ -311,24 +311,24 @@ topology_template:
       network.incoming.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.incoming.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
       network.outgoing.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes.rate
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_4:
+      - server_cmaui_4
+      - memory.usage
+      cpu_util_server_cmaui_4:
+      - server_cmaui_4
+      - cpu_util
     requirements:
       dependency_cmaui_port_8:
       - cmaui_port_8
@@ -342,9 +342,9 @@ topology_template:
       link_cmaui_port_7:
       - cmaui_port_7
       - link
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
       - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
index c73fcf6..d59f16e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested1.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
index b4655fa..dca4585 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested2.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
index 5553883..157b085 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested3.yml
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
index ce3ffb7..0e689ef 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/inputfiles/nested4.yml
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: p2},{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
index 758276f..1782edf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
@@ -74,7 +74,7 @@ resources:
       metadata:
         cdr_network_ip_0:
           get_attr:
-          - cdr_network_port
+          - cdr_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -121,7 +121,7 @@ resources:
       - port:
           get_resource: oam_private_net_network_port
       - port:
-          get_resource: cdr_network_port
+          get_resource: cdr_network_port_1
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py
@@ -152,7 +152,7 @@ resources:
             get_file: FEAdd_On_Module_QRouterCloudConfig
       user_data_format: RAW
     type: OS::Nova::Server
-  cdr_network_port:
+  cdr_network_port_1:
     properties:
       network:
         get_param: cdr_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
index 80a65d1..4c7f0f2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml
@@ -72,7 +72,7 @@ parameters:
   vnf_id:
     type: string
 resources:
-  oam_private_net_network_port:
+  oam_private_net_network_port_3:
     properties:
       network:
         get_param: oam_private_net_name
@@ -86,7 +86,7 @@ resources:
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_mirror_network_port:
+  packet_mirror_network_port_1:
     properties:
       network:
         get_param: packet_mirror_network
@@ -123,13 +123,13 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_3
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_3
           - fixed_ip_0s
           - 0
           - ip_address
@@ -147,13 +147,13 @@ resources:
           - ip_address
         packet_mirror_network_cidr:
           get_attr:
-          - packet_mirror_network_port
+          - packet_mirror_network_port_1
           - subnets
           - 0
           - cidr
         packet_mirror_network_ip_0:
           get_attr:
-          - packet_mirror_network_port
+          - packet_mirror_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -193,9 +193,9 @@ resources:
         - get_param: vLBAgent_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_3
       - port:
-          get_resource: packet_mirror_network_port
+          get_resource: packet_mirror_network_port_1
       - port:
           get_resource: packet_internal_network_port
       personality:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
index afc435a..ad3a156 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml
@@ -68,14 +68,14 @@ parameters:
   vnf_id:
     type: string
 resources:
-  oam_private_net_network_port:
+  oam_private_net_network_port_2:
     properties:
       network:
         get_param: oam_private_net_name
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_internal_network_port:
+  packet_internal_network_port_2:
     properties:
       network:
         get_param: packet_internal_network
@@ -119,25 +119,25 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_2
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_2
           - fixed_ip_0s
           - 0
           - ip_address
         packet_internal_network_cidr:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_2
           - subnets
           - 0
           - cidr
         packet_internal_network_ip_0:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_2
           - fixed_ip_0s
           - 0
           - ip_address
@@ -187,11 +187,11 @@ resources:
         - get_param: vLB_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_2
       - port:
           get_resource: packet_mirror_network_port
       - port:
-          get_resource: packet_internal_network_port
+          get_resource: packet_internal_network_port_2
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
index d343ee5..e294a34 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml
@@ -122,25 +122,25 @@ resources:
           get_param: ntp_timezone
         oam_private_network_cidr:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_1
           - subnets
           - 0
           - cidr
         oam_private_network_ip_0:
           get_attr:
-          - oam_private_net_network_port
+          - oam_private_net_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
         packet_internal_network_cidr:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_1
           - subnets
           - 0
           - cidr
         packet_internal_network_ip_0:
           get_attr:
-          - packet_internal_network_port
+          - packet_internal_network_port_1
           - fixed_ip_0s
           - 0
           - ip_address
@@ -177,11 +177,11 @@ resources:
         - get_param: vprobe_index
       networks:
       - port:
-          get_resource: oam_private_net_network_port
+          get_resource: oam_private_net_network_port_1
       - port:
           get_resource: cdr_network_port
       - port:
-          get_resource: packet_internal_network_port
+          get_resource: packet_internal_network_port_1
       personality:
         /root/CheckAvailability/check_availability.py:
           get_file: check_availability.py
@@ -239,14 +239,14 @@ resources:
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  oam_private_net_network_port:
+  oam_private_net_network_port_1:
     properties:
       network:
         get_param: oam_private_net_name
       security_groups:
       - get_param: security_group
     type: OS::Neutron::Port
-  packet_internal_network_port:
+  packet_internal_network_port_1:
     properties:
       network:
         get_param: packet_internal_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
index ca861cb..9ca9550 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
@@ -134,23 +134,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    qrouter_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_1
-        size: '(get_input : qrouter_volume_size_1) * 1024'
-        description:
-          get_input: qrouter_volume_name_1
-    qrouter_volume_0:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_0
-        size: '(get_input : qrouter_volume_size_0) * 1024'
-        description:
-          get_input: qrouter_volume_name_0
-    cdr_network_port:
+    cdr_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -171,6 +155,22 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: QRouter1
           relationship: tosca.relationships.network.BindsTo
+    qrouter_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_1
+        size: '(get_input : qrouter_volume_size_1) * 1024'
+        description:
+          get_input: qrouter_volume_name_1
+    qrouter_volume_0:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_0
+        size: '(get_input : qrouter_volume_size_0) * 1024'
+        description:
+          get_input: qrouter_volume_name_0
     qrouter_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -195,7 +195,7 @@ topology_template:
           cluster_name:
             get_input: qrouter_cluster_name
           cdr_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_cdr_network_port_1.fixed_ip_0s
           repo_ip_0:
             get_input: rpmrepository_ip_0
           mount_colon__slash_data: qrouter_volume_0
@@ -319,18 +319,15 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_QRouterTemplate.yaml
       members:
+      - cdr_network_port_1
       - qrouter_volume_1
       - qrouter_volume_0
-      - cdr_network_port
       - qrouter_volume_2
       - QRouter1
       - oam_private_net_network_port
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate
     capabilities:
-      network.outgoing.bytes_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.bytes
       binding_QRouter1:
       - QRouter1
       - binding
@@ -358,12 +355,6 @@ topology_template:
       attachment_qrouter_volume_1:
       - qrouter_volume_1
       - attachment
-      attachment_cdr_network_port:
-      - cdr_network_port
-      - attachment
-      network.incoming.packets_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.packets
       disk.device.read.bytes.rate_QRouter1:
       - QRouter1
       - disk.device.read.bytes.rate
@@ -376,9 +367,6 @@ topology_template:
       network.outpoing.packets_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outpoing.packets
-      network.outpoing.packets_cdr_network_port:
-      - cdr_network_port
-      - network.outpoing.packets
       memory.resident_QRouter1:
       - QRouter1
       - memory.resident
@@ -388,18 +376,15 @@ topology_template:
       host_QRouter1:
       - QRouter1
       - host
-      feature_cdr_network_port:
-      - cdr_network_port
-      - feature
       disk.device.write.bytes.rate_QRouter1:
       - QRouter1
       - disk.device.write.bytes.rate
       disk.device.usage_QRouter1:
       - QRouter1
       - disk.device.usage
-      network.incoming.bytes_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.bytes
+      feature_cdr_network_port_1:
+      - cdr_network_port_1
+      - feature
       instance_QRouter1:
       - QRouter1
       - instance
@@ -445,42 +430,51 @@ topology_template:
       disk.device.capacity_QRouter1:
       - QRouter1
       - disk.device.capacity
-      network.incoming.bytes.rate_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.bytes.rate
       network.outgoing.bytes_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outgoing.bytes
+      network.incoming.packets.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.packets.rate
       disk.iops_QRouter1:
       - QRouter1
       - disk.iops
       disk.device.write.requests_QRouter1:
       - QRouter1
       - disk.device.write.requests
+      network.incoming.packets_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.packets
+      attachment_cdr_network_port_1:
+      - cdr_network_port_1
+      - attachment
       disk.device.write.requests.rate_QRouter1:
       - QRouter1
       - disk.device.write.requests.rate
       disk.device.allocation_QRouter1:
       - QRouter1
       - disk.device.allocation
+      network.outpoing.packets_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outpoing.packets
       memory_QRouter1:
       - QRouter1
       - memory
       disk.usage_QRouter1:
       - QRouter1
       - disk.usage
+      binding_cdr_network_port_1:
+      - cdr_network_port_1
+      - binding
       scalable_QRouter1:
       - QRouter1
       - scalable
-      network.outgoing.bytes.rate_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.bytes.rate
       binding_oam_private_net_network_port:
       - oam_private_net_network_port
       - binding
-      network.incoming.packets.rate_cdr_network_port:
-      - cdr_network_port
-      - network.incoming.packets.rate
+      network.incoming.bytes_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.bytes
       disk.write.bytes_QRouter1:
       - QRouter1
       - disk.write.bytes
@@ -493,6 +487,9 @@ topology_template:
       cpu_QRouter1:
       - QRouter1
       - cpu
+      network.outgoing.bytes.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.bytes.rate
       os_QRouter1:
       - QRouter1
       - os
@@ -505,18 +502,18 @@ topology_template:
       disk.read.bytes_QRouter1:
       - QRouter1
       - disk.read.bytes
-      binding_cdr_network_port:
-      - cdr_network_port
-      - binding
+      network.incoming.bytes.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.bytes
       disk.write.bytes.rate_QRouter1:
       - QRouter1
       - disk.write.bytes.rate
       disk.device.write.bytes_QRouter1:
       - QRouter1
       - disk.device.write.bytes
-      network.outgoing.packets.rate_cdr_network_port:
-      - cdr_network_port
-      - network.outgoing.packets.rate
       disk.device.iops_QRouter1:
       - QRouter1
       - disk.device.iops
@@ -529,6 +526,9 @@ topology_template:
       disk.allocation_QRouter1:
       - QRouter1
       - disk.allocation
+      network.outgoing.packets.rate_cdr_network_port_1:
+      - cdr_network_port_1
+      - network.outgoing.packets.rate
       disk.device.read.requests_QRouter1:
       - QRouter1
       - disk.device.read.requests
@@ -539,6 +539,9 @@ topology_template:
       local_storage_QRouter1:
       - QRouter1
       - local_storage
+      link_cdr_network_port_1:
+      - cdr_network_port_1
+      - link
       dependency_qrouter_volume_1:
       - qrouter_volume_1
       - dependency
@@ -548,18 +551,15 @@ topology_template:
       dependency_qrouter_volume_0:
       - qrouter_volume_0
       - dependency
-      dependency_cdr_network_port:
-      - cdr_network_port
-      - dependency
       link_oam_private_net_network_port:
       - oam_private_net_network_port
       - link
       dependency_qrouter_volume_2:
       - qrouter_volume_2
       - dependency
-      link_cdr_network_port:
-      - cdr_network_port
-      - link
       dependency_QRouter1:
       - QRouter1
+      - dependency
+      dependency_cdr_network_port_1:
+      - cdr_network_port_1
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
index d31b276..5d0b643 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml
@@ -154,7 +154,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    packet_mirror_network_port:
+    packet_mirror_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -189,7 +189,7 @@ topology_template:
             get_input: vf_module_id
           packet_mirror_network_cidr:
             get_attribute:
-            - packet_mirror_network_port
+            - packet_mirror_network_port_1
             - subnets
             - 0
             - cidr
@@ -213,7 +213,7 @@ topology_template:
           mount_colon__slash_config: vLBAgent_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_3
             - subnets
             - 0
             - cidr
@@ -241,9 +241,9 @@ topology_template:
             get_input: vLBAgent_type
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_3.fixed_ip_0s
           packet_mirror_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port_1.fixed_ip_0s
           vLBAgent_name:
             get_input:
             - vLBAgent_names
@@ -323,7 +323,15 @@ topology_template:
         size: '(get_input : vLBAgent_volume_size_0) * 1024'
         description:
           get_input: vLBAgent_volume_name_0
-    oam_private_net_network_port:
+    vLBAgent_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLBAgent_volume_type_1
+        size: '(get_input : vLBAgent_volume_size_1) * 1024'
+        description:
+          get_input: vLBAgent_volume_name_1
+    oam_private_net_network_port_3:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -345,14 +353,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vLBAgentInstance
           relationship: tosca.relationships.network.BindsTo
-    vLBAgent_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLBAgent_volume_type_1
-        size: '(get_input : vLBAgent_volume_size_1) * 1024'
-        description:
-          get_input: vLBAgent_volume_name_1
     vLBAgent_volume_2:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -404,43 +404,46 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_vLBAgentTemplate.yaml
       members:
-      - packet_mirror_network_port
+      - packet_mirror_network_port_1
       - vLBAgentInstance
       - vLBAgent_volume_0
-      - oam_private_net_network_port
       - vLBAgent_volume_1
+      - oam_private_net_network_port_3
       - vLBAgent_volume_2
       - packet_internal_network_port
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBAgentTemplate
     capabilities:
+      network.incoming.bytes.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.bytes.rate
       disk.device.read.requests_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.requests
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
       network.incoming.packets_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.bytes.rate
       disk.device.usage_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.usage
-      network.outgoing.bytes_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.bytes.rate
       disk.read.requests_vLBAgentInstance:
       - vLBAgentInstance
       - disk.read.requests
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.packets
       cpu_util_vLBAgentInstance:
       - vLBAgentInstance
       - cpu_util
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - feature
       feature_vLBAgent_volume_1:
       - vLBAgent_volume_1
       - feature
@@ -453,9 +456,6 @@ topology_template:
       network.incoming.bytes.rate_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.bytes.rate
-      network.outgoing.bytes.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.bytes.rate
       disk.usage_vLBAgentInstance:
       - vLBAgentInstance
       - disk.usage
@@ -465,30 +465,36 @@ topology_template:
       disk.device.iops_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.iops
+      network.incoming.packets_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.packets
+      network.outgoing.bytes.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.bytes.rate
+      network.outpoing.packets_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outpoing.packets
       binding_packet_internal_network_port:
       - packet_internal_network_port
       - binding
       disk.device.write.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.write.bytes
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
-      network.outpoing.packets_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outpoing.packets
-      network.incoming.bytes_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.bytes
-      network.incoming.packets_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.packets
+      attachment_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - attachment
+      network.incoming.packets.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.packets.rate
+      binding_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - binding
       endpoint_vLBAgentInstance:
       - vLBAgentInstance
       - endpoint
+      binding_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - binding
       binding_vLBAgentInstance:
       - vLBAgentInstance
       - binding
@@ -501,21 +507,12 @@ topology_template:
       attachment_packet_internal_network_port:
       - packet_internal_network_port
       - attachment
-      network.incoming.packets.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.packets.rate
-      network.outgoing.packets.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.outgoing.packets.rate
       disk.read.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.read.bytes
       memory.usage_vLBAgentInstance:
       - vLBAgentInstance
       - memory.usage
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       scalable_vLBAgentInstance:
       - vLBAgentInstance
       - scalable
@@ -534,9 +531,6 @@ topology_template:
       disk.write.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
       memory_vLBAgentInstance:
       - vLBAgentInstance
       - memory
@@ -549,15 +543,36 @@ topology_template:
       disk.iops_vLBAgentInstance:
       - vLBAgentInstance
       - disk.iops
+      network.outgoing.packets.rate_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.packets.rate
+      feature_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - feature
       instance_vLBAgentInstance:
       - vLBAgentInstance
       - instance
+      network.incoming.bytes_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.bytes
+      attachment_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - attachment
       network.outgoing.bytes_packet_internal_network_port:
       - packet_internal_network_port
       - network.outgoing.bytes
+      network.outgoing.packets.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.packets.rate
       network.incoming.bytes_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.bytes
+      network.outpoing.packets_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outpoing.packets
+      network.outgoing.bytes_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.outgoing.bytes
       disk.device.read.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.requests.rate
@@ -567,18 +582,12 @@ topology_template:
       network.incoming.packets.rate_packet_internal_network_port:
       - packet_internal_network_port
       - network.incoming.packets.rate
-      attachment_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - attachment
       disk.write.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.requests.rate
       attachment_vLBAgent_volume_0:
       - vLBAgent_volume_0
       - attachment
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       disk.device.read.bytes_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.bytes
@@ -594,27 +603,18 @@ topology_template:
       disk.device.write.requests.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.write.requests.rate
-      feature_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - feature
-      binding_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - binding
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
-      network.incoming.bytes.rate_packet_mirror_network_port:
-      - packet_mirror_network_port
-      - network.incoming.bytes.rate
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
       disk.device.read.bytes.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.device.read.bytes.rate
+      network.outgoing.bytes_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.outgoing.bytes
       cpu.delta_vLBAgentInstance:
       - vLBAgentInstance
       - cpu.delta
+      network.incoming.bytes_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - network.incoming.bytes
       disk.capacity_vLBAgentInstance:
       - vLBAgentInstance
       - disk.capacity
@@ -639,6 +639,9 @@ topology_template:
       network.outpoing.packets_packet_internal_network_port:
       - packet_internal_network_port
       - network.outpoing.packets
+      network.incoming.packets.rate_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
+      - network.incoming.packets.rate
       vcpus_vLBAgentInstance:
       - vLBAgentInstance
       - vcpus
@@ -651,9 +654,6 @@ topology_template:
       disk.write.bytes.rate_vLBAgentInstance:
       - vLBAgentInstance
       - disk.write.bytes.rate
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
       dependency_vLBAgentInstance:
       - vLBAgentInstance
@@ -661,29 +661,29 @@ topology_template:
       dependency_packet_internal_network_port:
       - packet_internal_network_port
       - dependency
+      dependency_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - dependency
       link_packet_internal_network_port:
       - packet_internal_network_port
       - link
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - dependency
+      link_oam_private_net_network_port_3:
+      - oam_private_net_network_port_3
+      - link
       dependency_vLBAgent_volume_1:
       - vLBAgent_volume_1
       - dependency
       dependency_vLBAgent_volume_2:
       - vLBAgent_volume_2
       - dependency
-      dependency_packet_mirror_network_port:
-      - packet_mirror_network_port
+      dependency_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vLBAgent_volume_0:
       - vLBAgent_volume_0
       - dependency
-      link_packet_mirror_network_port:
-      - packet_mirror_network_port
+      link_packet_mirror_network_port_1:
+      - packet_mirror_network_port_1
       - link
       local_storage_vLBAgentInstance:
       - vLBAgentInstance

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
index e6c6845..e3896b2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml
@@ -146,7 +146,7 @@ topology_template:
       immutable: false
       type: float
   node_templates:
-    packet_mirror_network_port:
+    packet_internal_network_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -161,31 +161,13 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: packet_mirror_network
+          get_input: packet_internal_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
-    vLB_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_1
-        size: '(get_input : vLB_volume_size_1) * 1024'
-    vLB_volume_0:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_0
-        size: '(get_input : vLB_volume_size_0) * 1024'
-    vLB_volume_2:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: vLB_volume_type_2
-        size: '(get_input : vLB_volume_size_2) * 1024'
-    oam_private_net_network_port:
+    oam_private_net_network_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -207,7 +189,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
-    packet_internal_network_port:
+    packet_mirror_network_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -222,12 +204,30 @@ topology_template:
           mac_count_required:
             is_required: false
         network:
-          get_input: packet_internal_network
+          get_input: packet_mirror_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: vLBInstance
           relationship: tosca.relationships.network.BindsTo
+    vLB_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_1
+        size: '(get_input : vLB_volume_size_1) * 1024'
+    vLB_volume_0:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_0
+        size: '(get_input : vLB_volume_size_0) * 1024'
+    vLB_volume_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: vLB_volume_type_2
+        size: '(get_input : vLB_volume_size_2) * 1024'
     vLBInstance:
       type: org.openecomp.resource.vfc.nodes.heat.vLB
       properties:
@@ -247,7 +247,7 @@ topology_template:
             - 0
             - cidr
           packet_internal_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_2.fixed_ip_0s
           version_number:
             get_input: vLB_version_name
           machine_name:
@@ -264,7 +264,7 @@ topology_template:
           mount_colon__slash_config: vLB_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_2
             - subnets
             - 0
             - cidr
@@ -284,7 +284,7 @@ topology_template:
             get_input: vLB_version_name
           packet_internal_network_cidr:
             get_attribute:
-            - packet_internal_network_port
+            - packet_internal_network_port_2
             - subnets
             - 0
             - cidr
@@ -292,7 +292,7 @@ topology_template:
             get_input: vLB_type
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_2.fixed_ip_0s
           packet_mirror_network_ip_0:
           - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s
           vLBAgent_name:
@@ -381,25 +381,25 @@ topology_template:
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_vLBTemplate.yaml
       members:
+      - packet_internal_network_port_2
+      - oam_private_net_network_port_2
       - packet_mirror_network_port
       - vLB_volume_1
       - vLB_volume_0
       - vLB_volume_2
-      - oam_private_net_network_port
-      - packet_internal_network_port
       - vLBInstance
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate
     capabilities:
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
-      network.incoming.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets
       disk.iops_vLBInstance:
       - vLBInstance
       - disk.iops
+      network.incoming.packets_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.bytes.rate
       feature_vLBInstance:
       - vLBInstance
       - feature
@@ -409,57 +409,72 @@ topology_template:
       os_vLBInstance:
       - vLBInstance
       - os
+      network.outgoing.bytes.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.packets
       disk.device.write.bytes.rate_vLBInstance:
       - vLBInstance
       - disk.device.write.bytes.rate
       network.outgoing.bytes_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.bytes
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
+      network.incoming.bytes.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.bytes.rate
       disk.write.bytes.rate_vLBInstance:
       - vLBInstance
       - disk.write.bytes.rate
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - feature
+      network.outgoing.bytes_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.bytes
+      network.incoming.packets.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.packets.rate
       memory.usage_vLBInstance:
       - vLBInstance
       - memory.usage
       host_vLBInstance:
       - vLBInstance
       - host
-      network.incoming.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes.rate
       network.outgoing.bytes.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.bytes.rate
+      network.outpoing.packets_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outpoing.packets
       disk.device.capacity_vLBInstance:
       - vLBInstance
       - disk.device.capacity
-      binding_packet_internal_network_port:
-      - packet_internal_network_port
-      - binding
+      network.outpoing.packets_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outpoing.packets
+      network.incoming.packets.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.packets.rate
       instance_vLBInstance:
       - vLBInstance
       - instance
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
       binding_vLBInstance:
       - vLBInstance
       - binding
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
+      binding_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - binding
       disk.device.latency_vLBInstance:
       - vLBInstance
       - disk.device.latency
       network.outpoing.packets_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outpoing.packets
+      binding_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - binding
       network.incoming.bytes_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.bytes
@@ -469,30 +484,24 @@ topology_template:
       disk.device.read.requests.rate_vLBInstance:
       - vLBInstance
       - disk.device.read.requests.rate
-      attachment_packet_internal_network_port:
-      - packet_internal_network_port
-      - attachment
       network.incoming.packets.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.packets.rate
       network.outgoing.packets.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.outgoing.packets.rate
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       memory_vLBInstance:
       - vLBInstance
       - memory
+      network.incoming.bytes.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.bytes.rate
       cpu.delta_vLBInstance:
       - vLBInstance
       - cpu.delta
       disk.write.bytes_vLBInstance:
       - vLBInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
       disk.write.requests_vLBInstance:
       - vLBInstance
       - disk.write.requests
@@ -505,18 +514,21 @@ topology_template:
       disk.device.iops_vLBInstance:
       - vLBInstance
       - disk.device.iops
-      network.outgoing.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.packets.rate
       disk.capacity_vLBInstance:
       - vLBInstance
       - disk.capacity
       disk.device.read.bytes_vLBInstance:
       - vLBInstance
       - disk.device.read.bytes
+      attachment_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - attachment
       attachment_vLB_volume_0:
       - vLB_volume_0
       - attachment
+      network.outgoing.packets.rate_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.packets.rate
       attachment_vLB_volume_1:
       - vLB_volume_1
       - attachment
@@ -529,51 +541,51 @@ topology_template:
       memory.resident_vLBInstance:
       - vLBInstance
       - memory.resident
-      network.outgoing.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes
       disk.write.requests.rate_vLBInstance:
       - vLBInstance
       - disk.write.requests.rate
       disk.device.write.requests_vLBInstance:
       - vLBInstance
       - disk.device.write.requests
-      network.incoming.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes
-      network.incoming.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets.rate
+      network.outgoing.packets.rate_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.outgoing.packets.rate
+      attachment_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - attachment
       attachment_packet_mirror_network_port:
       - packet_mirror_network_port
       - attachment
       disk.read.requests_vLBInstance:
       - vLBInstance
       - disk.read.requests
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       disk.device.read.requests_vLBInstance:
       - vLBInstance
       - disk.device.read.requests
       disk.latency_vLBInstance:
       - vLBInstance
       - disk.latency
+      network.incoming.bytes_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - network.incoming.bytes
       feature_packet_mirror_network_port:
       - packet_mirror_network_port
       - feature
+      feature_packet_internal_network_port_2:
+      - packet_internal_network_port_2
+      - feature
       binding_packet_mirror_network_port:
       - packet_mirror_network_port
       - binding
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
+      network.outgoing.bytes_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.outgoing.bytes
+      network.incoming.bytes_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - network.incoming.bytes
       network.incoming.bytes.rate_packet_mirror_network_port:
       - packet_mirror_network_port
       - network.incoming.bytes.rate
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
       disk.device.write.requests.rate_vLBInstance:
       - vLBInstance
       - disk.device.write.requests.rate
@@ -595,9 +607,6 @@ topology_template:
       feature_vLB_volume_1:
       - vLB_volume_1
       - feature
-      network.outgoing.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes.rate
       cpu_vLBInstance:
       - vLBInstance
       - cpu
@@ -607,9 +616,6 @@ topology_template:
       endpoint_vLBInstance:
       - vLBInstance
       - endpoint
-      network.outpoing.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outpoing.packets
       disk.device.allocation_vLBInstance:
       - vLBInstance
       - disk.device.allocation
@@ -622,15 +628,9 @@ topology_template:
       disk.usage_vLBInstance:
       - vLBInstance
       - disk.usage
-      feature_packet_internal_network_port:
-      - packet_internal_network_port
-      - feature
       cpu_util_vLBInstance:
       - vLBInstance
       - cpu_util
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
       dependency_vLB_volume_0:
       - vLB_volume_0
@@ -641,27 +641,27 @@ topology_template:
       local_storage_vLBInstance:
       - vLBInstance
       - local_storage
-      dependency_packet_internal_network_port:
-      - packet_internal_network_port
+      dependency_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
       - dependency
-      link_packet_internal_network_port:
-      - packet_internal_network_port
-      - link
       dependency_vLB_volume_2:
       - vLB_volume_2
       - dependency
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
+      link_oam_private_net_network_port_2:
+      - oam_private_net_network_port_2
+      - link
+      dependency_packet_internal_network_port_2:
+      - packet_internal_network_port_2
       - dependency
       dependency_packet_mirror_network_port:
       - packet_mirror_network_port
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vLBInstance:
       - vLBInstance
       - dependency
       link_packet_mirror_network_port:
       - packet_mirror_network_port
+      - link
+      link_packet_internal_network_port_2:
+      - packet_internal_network_port_2
       - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
index 9808460..5edca0a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml
@@ -180,7 +180,7 @@ topology_template:
           cdr_network_ip_0:
           - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s
           packet_internal_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_1.fixed_ip_0s
           version_number:
             get_input: vProbe_version_name
           vprobe_type:
@@ -207,7 +207,7 @@ topology_template:
           mount_colon__slash_config: vprobe_volume_2
           oam_private_network_cidr:
             get_attribute:
-            - oam_private_net_network_port
+            - oam_private_net_network_port_1
             - subnets
             - 0
             - cidr
@@ -229,7 +229,7 @@ topology_template:
             get_input: vprobe_AppDependenciesMachineType
           packet_internal_network_cidr:
             get_attribute:
-            - packet_internal_network_port
+            - packet_internal_network_port_1
             - subnets
             - 0
             - cidr
@@ -237,7 +237,7 @@ topology_template:
             get_input: vProbe_node_count
           DPDK: DPDK_IP
           oam_private_network_ip_0:
-          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s
+          - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_1.fixed_ip_0s
           region:
             get_input: region_name
           manager_oam_direct_ip_0:
@@ -322,7 +322,7 @@ topology_template:
         size: '(get_input : vprobe_volume_size_0) * 1024'
         description:
           get_input: vprobe_volume_name_0
-    cdr_network_port:
+    oam_private_net_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -336,14 +336,15 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
+        network_role_tag: oam_private
         network:
-          get_input: cdr_network
+          get_input: oam_private_net_name
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: ProbeInstance
           relationship: tosca.relationships.network.BindsTo
-    oam_private_net_network_port:
+    cdr_network_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -357,15 +358,14 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network_role_tag: oam_private
         network:
-          get_input: oam_private_net_name
+          get_input: cdr_network
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: ProbeInstance
           relationship: tosca.relationships.network.BindsTo
-    packet_internal_network_port:
+    packet_internal_network_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
@@ -412,9 +412,9 @@ topology_template:
       - vprobe_volume_2
       - vprobe_volume_1
       - vprobe_volume_0
+      - oam_private_net_network_port_1
       - cdr_network_port
-      - oam_private_net_network_port
-      - packet_internal_network_port
+      - packet_internal_network_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate
     capabilities:
@@ -427,15 +427,21 @@ topology_template:
       disk.device.write.requests_ProbeInstance:
       - ProbeInstance
       - disk.device.write.requests
-      attachment_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - attachment
       disk.iops_ProbeInstance:
       - ProbeInstance
       - disk.iops
-      network.incoming.packets_packet_internal_network_port:
-      - packet_internal_network_port
+      network.incoming.packets_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.packets
+      network.outgoing.bytes.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.bytes.rate
+      network.incoming.packets_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - network.incoming.packets
+      network.outgoing.bytes.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.bytes.rate
       attachment_cdr_network_port:
       - cdr_network_port
       - attachment
@@ -445,54 +451,57 @@ topology_template:
       feature_ProbeInstance:
       - ProbeInstance
       - feature
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes.rate
-      network.outpoing.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outpoing.packets
+      feature_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - feature
+      network.incoming.bytes.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.bytes
       network.outpoing.packets_cdr_network_port:
       - cdr_network_port
       - network.outpoing.packets
-      network.incoming.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes.rate
+      network.incoming.packets.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.packets.rate
       disk.device.latency_ProbeInstance:
       - ProbeInstance
       - disk.device.latency
       feature_cdr_network_port:
       - cdr_network_port
       - feature
+      network.outpoing.packets_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outpoing.packets
       disk.write.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.write.bytes.rate
+      network.outpoing.packets_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outpoing.packets
       network.incoming.bytes_cdr_network_port:
       - cdr_network_port
       - network.incoming.bytes
       host_ProbeInstance:
       - ProbeInstance
       - host
-      binding_packet_internal_network_port:
-      - packet_internal_network_port
+      network.incoming.packets.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.packets.rate
+      binding_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - binding
-      network.incoming.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes
       memory_ProbeInstance:
       - ProbeInstance
       - memory
-      feature_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - feature
-      attachment_packet_internal_network_port:
-      - packet_internal_network_port
-      - attachment
+      binding_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - binding
       disk.device.read.requests_ProbeInstance:
       - ProbeInstance
       - disk.device.read.requests
-      network.incoming.bytes.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.bytes.rate
       memory.resident_ProbeInstance:
       - ProbeInstance
       - memory.resident
@@ -517,36 +526,39 @@ topology_template:
       disk.write.bytes_ProbeInstance:
       - ProbeInstance
       - disk.write.bytes
-      network.outgoing.bytes_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.bytes.rate
       disk.device.capacity_ProbeInstance:
       - ProbeInstance
       - disk.device.capacity
+      attachment_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - attachment
       endpoint_ProbeInstance:
       - ProbeInstance
       - endpoint
-      network.outgoing.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.packets.rate
       disk.ephemeral.size_ProbeInstance:
       - ProbeInstance
       - disk.ephemeral.size
       disk.read.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.read.bytes.rate
+      network.outgoing.packets.rate_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.packets.rate
       disk.latency_ProbeInstance:
       - ProbeInstance
       - disk.latency
       os_ProbeInstance:
       - ProbeInstance
       - os
-      network.outgoing.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes
-      network.incoming.bytes_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.bytes
+      network.outgoing.packets.rate_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.outgoing.packets.rate
+      attachment_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - attachment
       cpu_util_ProbeInstance:
       - ProbeInstance
       - cpu_util
@@ -568,9 +580,6 @@ topology_template:
       attachment_vprobe_volume_2:
       - vprobe_volume_2
       - attachment
-      network.incoming.packets.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.incoming.packets.rate
       attachment_vprobe_volume_1:
       - vprobe_volume_1
       - attachment
@@ -580,9 +589,6 @@ topology_template:
       network.outgoing.bytes.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.bytes.rate
-      binding_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - binding
       binding_ProbeInstance:
       - ProbeInstance
       - binding
@@ -592,6 +598,9 @@ topology_template:
       disk.capacity_ProbeInstance:
       - ProbeInstance
       - disk.capacity
+      network.incoming.bytes_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - network.incoming.bytes
       disk.write.requests.rate_ProbeInstance:
       - ProbeInstance
       - disk.write.requests.rate
@@ -604,15 +613,18 @@ topology_template:
       feature_vprobe_volume_2:
       - vprobe_volume_2
       - feature
-      network.incoming.packets_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets
+      feature_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - feature
       feature_vprobe_volume_0:
       - vprobe_volume_0
       - feature
-      network.incoming.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.incoming.packets.rate
+      network.outgoing.bytes_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.outgoing.bytes
+      network.incoming.bytes_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
+      - network.incoming.bytes
       disk.device.read.requests.rate_ProbeInstance:
       - ProbeInstance
       - disk.device.read.requests.rate
@@ -631,9 +643,6 @@ topology_template:
       disk.usage_ProbeInstance:
       - ProbeInstance
       - disk.usage
-      network.outgoing.bytes.rate_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outgoing.bytes.rate
       binding_cdr_network_port:
       - cdr_network_port
       - binding
@@ -646,34 +655,19 @@ topology_template:
       network.outgoing.packets.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.packets.rate
-      network.outpoing.packets_packet_internal_network_port:
-      - packet_internal_network_port
-      - network.outpoing.packets
-      feature_packet_internal_network_port:
-      - packet_internal_network_port
-      - feature
       disk.device.read.bytes.rate_ProbeInstance:
       - ProbeInstance
       - disk.device.read.bytes.rate
-      network.outgoing.packets.rate_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - network.outgoing.packets.rate
     requirements:
-      dependency_packet_internal_network_port:
-      - packet_internal_network_port
-      - dependency
-      link_packet_internal_network_port:
-      - packet_internal_network_port
+      link_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - link
-      dependency_oam_private_net_network_port:
-      - oam_private_net_network_port
+      dependency_oam_private_net_network_port_1:
+      - oam_private_net_network_port_1
       - dependency
       dependency_cdr_network_port:
       - cdr_network_port
       - dependency
-      link_oam_private_net_network_port:
-      - oam_private_net_network_port
-      - link
       dependency_vprobe_volume_1:
       - vprobe_volume_1
       - dependency
@@ -689,6 +683,12 @@ topology_template:
       local_storage_ProbeInstance:
       - ProbeInstance
       - local_storage
+      dependency_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - dependency
+      link_packet_internal_network_port_1:
+      - packet_internal_network_port_1
+      - link
       dependency_vprobe_volume_2:
       - vprobe_volume_2
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 86de04a..01329a4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -131,33 +131,33 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_qrouter_volume_1:
+    - dependency_cdr_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_qrouter_volume_0:
+    - link_cdr_network_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_qrouter_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cdr_network_port:
+    - dependency_qrouter_volume_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cdr_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_qrouter_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -193,12 +193,6 @@ node_types:
         - 1
         - 1
     capabilities:
-      network.outgoing.bytes_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_QRouter1:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -245,17 +239,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cdr_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -280,12 +263,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.resident_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -305,11 +282,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cdr_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.write.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -322,9 +294,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cdr_network_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -416,13 +387,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cdr_network_port:
+      network.outgoing.bytes_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
+      network.incoming.packets.rate_cdr_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -440,6 +411,17 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cdr_network_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.requests.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -452,6 +434,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -464,14 +452,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_QRouter1:
-        type: tosca.capabilities.Scalable
+      binding_cdr_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_QRouter1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -482,7 +471,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cdr_network_port:
+      network.incoming.bytes_cdr_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -512,6 +501,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_QRouter1:
         type: tosca.capabilities.OperatingSystem
         occurrences:
@@ -535,26 +530,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cdr_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.bytes.rate_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.write.bytes.rate_QRouter1:
+      network.outgoing.bytes_cdr_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_QRouter1:
+      disk.write.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cdr_network_port:
+      disk.device.write.bytes_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -583,6 +577,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_cdr_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -741,14 +741,14 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_packet_mirror_network_port:
+    - dependency_packet_mirror_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_mirror_network_port:
+    - link_packet_mirror_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -775,26 +775,26 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_oam_private_net_network_port:
+    - dependency_vLBAgent_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_vLBAgent_volume_1:
+    - dependency_oam_private_net_network_port_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
+    - link_oam_private_net_network_port_3:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     - dependency_vLBAgent_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -816,14 +816,15 @@ node_types:
         - 1
         - 1
     capabilities:
-      disk.device.read.requests_vLBAgentInstance:
+      network.incoming.bytes.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.device.read.requests_vLBAgentInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -833,13 +834,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.bytes.rate_oam_private_net_network_port_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_mirror_network_port:
+      network.incoming.bytes.rate_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -851,7 +858,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      network.incoming.packets_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -863,9 +870,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_oam_private_net_network_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -890,12 +896,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_mirror_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.usage_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -914,53 +914,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.incoming.packets_packet_mirror_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.device.write.bytes_vLBAgentInstance:
+      network.outgoing.bytes.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_port:
+      network.outpoing.packets_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_private_net_network_port:
-        type: tosca.capabilities.Node
+      binding_packet_internal_network_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outpoing.packets_packet_mirror_network_port:
+      disk.device.write.bytes_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_mirror_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_mirror_network_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_packet_mirror_network_port:
+      network.incoming.packets.rate_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      binding_oam_private_net_network_port_3:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       endpoint_vLBAgentInstance:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
+      binding_packet_mirror_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       binding_vLBAgentInstance:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -983,114 +997,130 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_packet_mirror_network_port:
+      disk.read.bytes_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_mirror_network_port:
+      memory.usage_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vLBAgentInstance:
+      scalable_vLBAgentInstance:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_vLBAgentInstance:
+      disk.device.allocation_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_port:
+      cpu_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_vLBAgentInstance:
-        type: tosca.capabilities.Scalable
+      disk.device.write.requests_vLBAgentInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_vLBAgentInstance:
+      disk.write.bytes_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vLBAgentInstance:
+      memory_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_vLBAgentInstance:
+      disk.device.write.bytes.rate_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vLBAgentInstance:
+      network.outgoing.packets.rate_packet_internal_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_vLBAgentInstance:
+      disk.iops_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
+      network.outgoing.packets.rate_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_vLBAgentInstance:
+      feature_packet_mirror_network_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      instance_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_vLBAgentInstance:
+      network.incoming.bytes_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_internal_network_port:
+      attachment_oam_private_net_network_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_packet_internal_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_vLBAgentInstance:
+      network.outgoing.packets.rate_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vLBAgentInstance:
+      network.incoming.bytes_packet_internal_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_internal_network_port:
+      network.outpoing.packets_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
+      network.outgoing.bytes_packet_mirror_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1113,11 +1143,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_mirror_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1129,13 +1154,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.bytes_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1165,43 +1183,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_mirror_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_packet_mirror_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.bytes.rate_packet_mirror_network_port:
+      disk.device.read.bytes.rate_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_vLBAgentInstance:
+      cpu.delta_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vLBAgentInstance:
+      network.incoming.bytes_oam_private_net_network_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1254,6 +1254,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.packets.rate_packet_mirror_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_vLBAgentInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1277,12 +1283,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -1421,66 +1421,66 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_packet_mirror_network_port:
+    - dependency_packet_internal_network_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_mirror_network_port:
+    - link_packet_internal_network_port_2:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_vLB_volume_1:
+    - dependency_oam_private_net_network_port_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vLB_volume_0:
+    - link_oam_private_net_network_port_2:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_packet_mirror_network_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vLB_volume_2:
+    - link_packet_mirror_network_port:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_vLB_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_oam_private_net_network_port:
+    - dependency_vLB_volume_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - dependency_packet_internal_network_port:
+    - dependency_vLB_volume_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_internal_network_port:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
     - dependency_vLBInstance:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1496,18 +1496,19 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.iops_vLBInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_packet_internal_network_port:
+      network.incoming.packets_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_vLBInstance:
+      network.outgoing.bytes.rate_oam_private_net_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1529,31 +1530,54 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_vLBInstance:
+      network.outgoing.bytes.rate_packet_internal_network_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_oam_private_net_network_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes.rate_vLBInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_packet_mirror_network_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_oam_private_net_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_mirror_network_port:
+      disk.write.bytes.rate_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_oam_private_net_network_port_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_vLBInstance:
+      network.outgoing.bytes_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
+      network.incoming.packets.rate_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1572,13 +1596,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_packet_internal_network_port:
+      network.outgoing.bytes.rate_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_mirror_network_port:
+      network.outpoing.packets_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1590,20 +1614,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      network.outpoing.packets_oam_private_net_network_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      instance_vLBInstance:
+      network.incoming.packets.rate_oam_private_net_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_port:
+      instance_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1614,10 +1637,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_private_net_network_port:
-        type: tosca.capabilities.Node
+      binding_oam_private_net_network_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.latency_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -1631,6 +1656,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_packet_internal_network_port_2:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       network.incoming.bytes_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1649,11 +1681,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets.rate_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1666,13 +1693,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_port:
+      memory_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_vLBInstance:
+      network.incoming.bytes.rate_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1690,12 +1717,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1719,21 +1740,20 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_internal_network_port:
+      disk.capacity_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_vLBInstance:
+      disk.device.read.bytes_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_vLBInstance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_internal_network_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -1742,6 +1762,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outgoing.packets.rate_oam_private_net_network_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_vLB_volume_1:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -1765,12 +1791,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.write.requests.rate_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1783,15 +1803,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
+      network.outgoing.packets.rate_packet_internal_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_oam_private_net_network_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -1806,13 +1825,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       disk.device.read.requests_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1825,11 +1837,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_packet_internal_network_port_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       feature_packet_mirror_network_port:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
+      feature_packet_internal_network_port_2:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_packet_mirror_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1837,19 +1860,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_packet_mirror_network_port:
+      network.incoming.bytes_oam_private_net_network_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_private_net_network_port:
+      network.incoming.bytes.rate_packet_mirror_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1895,12 +1918,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1917,12 +1934,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.allocation_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1946,23 +1957,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_internal_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       cpu_util_vLBInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -2152,40 +2152,40 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cdr_network_port:
+    - dependency_oam_private_net_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cdr_network_port:
+    - link_oam_private_net_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_oam_private_net_network_port:
+    - dependency_cdr_network_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_oam_private_net_network_port:
+    - link_cdr_network_port:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_packet_internal_network_port:
+    - dependency_packet_internal_network_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_packet_internal_network_port:
+    - link_packet_internal_network_port_1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -2210,18 +2210,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_oam_private_net_network_port:
-        type: tosca.capabilities.Attachment
+      disk.iops_ProbeInstance:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_ProbeInstance:
+      network.incoming.packets_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_packet_internal_network_port:
+      network.outgoing.bytes.rate_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2243,13 +2256,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      feature_oam_private_net_network_port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_oam_private_net_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
+      network.outgoing.bytes_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2261,7 +2279,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_packet_internal_network_port:
+      network.incoming.packets.rate_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2278,12 +2296,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_packet_internal_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      network.outpoing.packets_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2297,34 +2327,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_packet_internal_network_port:
+      network.incoming.packets.rate_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_oam_private_net_network_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
         - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_private_net_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_packet_internal_network_port:
-        type: tosca.capabilities.Attachment
+      binding_packet_internal_network_port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
       disk.device.read.requests_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
@@ -2332,12 +2359,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       memory.resident_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2385,7 +2406,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
+      network.incoming.bytes.rate_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2397,24 +2418,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      attachment_packet_internal_network_port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_ProbeInstance:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_packet_internal_network_port:
+      disk.ephemeral.size_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_ProbeInstance:
+      disk.read.bytes.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_ProbeInstance:
+      network.outgoing.packets.rate_oam_private_net_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2431,15 +2457,14 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_packet_internal_network_port:
+      network.outgoing.packets.rate_packet_internal_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_oam_private_net_network_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
@@ -2484,12 +2509,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       attachment_vprobe_volume_1:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -2506,13 +2525,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_oam_private_net_network_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
       binding_ProbeInstance:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -2530,6 +2542,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes_packet_internal_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_ProbeInstance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2552,9 +2570,8 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_packet_internal_network_port_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -2563,7 +2580,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_private_net_network_port:
+      network.outgoing.bytes_oam_private_net_network_port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_oam_private_net_network_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2605,12 +2628,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cdr_network_port:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2636,24 +2653,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_packet_internal_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_packet_internal_network_port:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       disk.device.read.bytes.rate_ProbeInstance:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.packets.rate_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
index 7d2364e..de4eb2c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
@@ -603,7 +603,7 @@ topology_template:
         rpmrepository_ip_0:
           get_input: rpmrepository_ip_0
       requirements:
-      - link_packet_mirror_network_port:
+      - link_packet_mirror_network_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_mirror_network
           relationship: tosca.relationships.network.LinksTo
@@ -709,7 +709,7 @@ topology_template:
         rpmrepository_ip_0:
           get_input: rpmrepository_ip_0
       requirements:
-      - link_packet_internal_network_port:
+      - link_packet_internal_network_port_1:
           capability: tosca.capabilities.network.Linkable
           node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
@@ -833,15 +833,15 @@ topology_template:
           node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cdr_network_port
+          capability: attachment_cdr_network_port_1
           node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_packet_internal_network_port_2
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_internal_network_port
+          capability: attachment_oam_private_net_network_port_2
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -849,7 +849,7 @@ topology_template:
           node: vLB
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_packet_mirror_network_port_1
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -857,19 +857,19 @@ topology_template:
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_mirror_network_port
+          capability: attachment_oam_private_net_network_port_3
           node: vLBAgent
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_oam_private_net_network_port
+          capability: attachment_cdr_network_port
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_cdr_network_port
+          capability: attachment_packet_internal_network_port_1
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_packet_internal_network_port
+          capability: attachment_oam_private_net_network_port_1
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
     QRouter0:
@@ -1026,13 +1026,13 @@ topology_template:
         vLB_volume_size_2:
           get_input: vLB_volume_size_2
       requirements:
-      - link_packet_mirror_network_port:
+      - link_packet_internal_network_port_2:
           capability: tosca.capabilities.network.Linkable
-          node: packet_mirror_network
+          node: packet_internal_network
           relationship: tosca.relationships.network.LinksTo
-      - link_packet_internal_network_port:
+      - link_packet_mirror_network_port:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_mirror_network
           relationship: tosca.relationships.network.LinksTo
       - dependency:
           capability: tosca.capabilities.Node

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index b2eb38f..e73e81a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,14 +69,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -103,6 +103,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -143,6 +157,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -156,14 +184,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+    - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -196,34 +224,6 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested2Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_cmaui_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -238,24 +238,7 @@ node_types:
         - 1
         - 1
     capabilities:
-      os_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -274,39 +257,38 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.latency_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Node
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -316,8 +298,9 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.read.requests_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -334,73 +317,89 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3_test_nested2Level:
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested2Level:
+      disk.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -418,7 +417,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -441,12 +452,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -459,52 +465,37 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      instance_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -522,35 +513,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -565,58 +545,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.device.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -634,49 +604,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.bytes_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -698,274 +668,252 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      cpu_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      disk.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      network.incoming.bytes_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
+      feature_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested2Level:
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_3_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -981,59 +929,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui:
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1044,7 +975,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1055,47 +986,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.device.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1107,61 +1033,66 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      disk.capacity_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.write.bytes.rate_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
-      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
+      disk.device.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested2Level:
+      network.outgoing.bytes_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      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
-      disk.device.read.bytes_server_cmaui:
+      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:
@@ -1173,43 +1104,43 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      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.latency_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_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_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.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_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:
@@ -1221,91 +1152,77 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.incoming.packets_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_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
-      network.incoming.packets_cmaui_port_1:
+      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
-      disk.device.read.bytes_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.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_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
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_3_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      network.outpoing.packets_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 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.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_4_test_nested2Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -1313,36 +1230,36 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested2Level:
+      disk.device.usage_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1353,19 +1270,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested2Level:
+      network.outgoing.bytes.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1382,142 +1299,140 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.iops_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested2Level:
+      disk.write.bytes_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      feature_server_cmaui_1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_2:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
+      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1529,30 +1444,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested2Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested2Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1574,19 +1495,31 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_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
-      memory.resident_server_cmaui_test_nested2Level:
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1598,25 +1531,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      host_server_cmaui_1:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_server_cmaui_2_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1630,37 +1580,49 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      scalable_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested2Level:
+      vcpus_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1684,13 +1646,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1706,13 +1680,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1724,18 +1710,32 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.resident_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_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.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.latency_server_cmaui_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_cmaui_2_test_nested2Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1805,6 +1805,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_2:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_2:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1845,6 +1859,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -1858,14 +1886,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level_test_nested3Level:
+    - dependency_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level_test_nested3Level:
+    - local_storage_server_cmaui_3_test_nested3Level:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -1898,161 +1926,109 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui_test_nested3Level:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     capabilities:
-      cpu.delta_server_cmaui:
+      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:
+      cpu_util_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_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
-      disk.device.allocation_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:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_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.device.capacity_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.root.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.read.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_3:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2063,26 +2039,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.capacity_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2091,191 +2068,191 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_3:
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_4:
+      network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
+      disk.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_5_test_nested3Level:
+      network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested3Level:
+      network.outpoing.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -2286,7 +2263,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
+      disk.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2299,24 +2276,7 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_cmaui:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2332,7 +2292,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2344,19 +2304,24 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_3:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.root.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2375,19 +2340,24 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_4:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2399,194 +2369,208 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.device.latency_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested3Level:
+      cpu_util_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_3:
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_3:
-        type: tosca.capabilities.Node
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_4:
+      network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_4:
-        type: tosca.capabilities.Node
+      disk.device.write.bytes_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_6_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
+      cpu_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_3:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_4:
+      disk.write.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      network.incoming.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_3:
-        type: tosca.capabilities.Attachment
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_4:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_4:
+      attachment_cmaui_port_6_test_nested3Level:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.allocation_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      instance_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      attachment_cmaui_port_3:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_cmaui_port_4:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_3:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2598,41 +2582,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.usage_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.device.usage_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2646,39 +2636,42 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -2688,217 +2681,193 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      attachment_cmaui_port_5_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5_test_nested3Level:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested3Level:
+      host_server_cmaui_2:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      os_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested3Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-        type: tosca.capabilities.Attachment
+      feature_test_nested3Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      cpu.delta_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.iops_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested3Level:
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_3_test_nested3Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      vcpus_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_4:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      network.outgoing.bytes_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2923,49 +2892,61 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      network.outpoing.packets_cmaui_port_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui_test_nested3Level:
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested3Level:
+      disk.capacity_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_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
-      network.outpoing.packets_cmaui_port_3:
+      disk.device.read.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2977,12 +2958,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      memory.resident_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -2990,13 +2988,15 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      scalable_server_cmaui_test_nested3Level:
-        type: tosca.capabilities.Scalable
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3005,49 +3005,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
+      network.incoming.packets_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_5_test_nested3Level:
+      disk.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      memory.resident_server_cmaui_3_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3127,6 +3127,20 @@ node_types:
         occurrences:
         - 1
         - 1
+    - dependency_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_cmaui_4_test_nested4Level:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_cmaui_port_8_test_nested4Level:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -3140,14 +3154,14 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui_test_nested4Level:
+    - dependency_server_cmaui_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui_test_nested4Level:
+    - local_storage_server_cmaui_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -3180,174 +3194,176 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_server_cmaui:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
+    capabilities:
+      memory.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+      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:
-        - 0
+        - 1
+        - UNBOUNDED
+      disk.device.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.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
+      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
-    capabilities:
-      cpu.delta_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
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_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
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      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_test_nested4Level:
+      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.root.size_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.write.bytes_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      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
-      cpu_server_cmaui_test_nested4Level:
+      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
-      vcpus_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui_test_nested4Level:
+      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.write.requests_server_cmaui:
+      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
-      network.incoming.bytes.rate_cmaui_port_7_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
-      instance_server_cmaui:
+      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
-      disk.latency_server_cmaui_test_nested4Level:
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_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.capacity_server_cmaui_test_nested4Level:
+      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
-      network.incoming.bytes.rate_cmaui_port_8_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
-      disk.root.size_server_cmaui:
+      memory.resident_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      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.read.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.
+      binding_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -3357,68 +3373,72 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      os_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_6:
+      cpu.delta_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      network.incoming.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
+      disk.capacity_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui_test_nested4Level:
+      disk.device.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.network.Bindable
+      endpoint_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
@@ -3428,17 +3448,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_5:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3459,30 +3474,31 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
+      disk.device.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Node
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3512,32 +3528,34 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4_test_nested4Level:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      cpu_util_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.Scalable
+      disk.device.write.bytes_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -3553,20 +3571,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_5:
+      feature_server_cmaui_3:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_5:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -3575,19 +3592,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3598,12 +3603,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_cmaui_port_8_test_nested4Level:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -3611,19 +3610,19 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_5:
+      disk.write.bytes_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3634,77 +3633,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_server_cmaui_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_5:
+      vcpus_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_6:
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_5:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_cmaui_port_8_test_nested4Level:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      instance_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_5:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_7_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_8_test_nested4Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.write.requests_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.outpoing.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3715,19 +3700,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
+      disk.usage_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui_test_nested4Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3738,30 +3723,29 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_6:
+      memory_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_cmaui_test_nested4Level:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui_test_nested4Level:
+      disk.root.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3774,88 +3758,97 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      disk.device.latency_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.allocation_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui_test_nested4Level:
+      disk.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui_test_nested4Level:
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_7_test_nested4Level:
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_test_nested4Level:
-        type: tosca.capabilities.Node
+      host_server_cmaui_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui_test_nested4Level:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_server_cmaui_4_test_nested4Level:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_6:
+      network.incoming.packets_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      feature_test_nested4Level:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
+      instance_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui_test_nested4Level:
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3867,19 +3860,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      network.outgoing.bytes_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_6:
+      network.outpoing.packets_cmaui_port_6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_6:
+      disk.read.bytes.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3891,56 +3884,63 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_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.read.bytes_server_cmaui_test_nested4Level:
+      network.incoming.bytes.rate_cmaui_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_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
-      network.incoming.bytes.rate_cmaui_port_5:
+      network.incoming.bytes_cmaui_port_7_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      cpu.delta_server_cmaui_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_7_test_nested4Level:
+      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
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      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
+      memory.usage_server_cmaui_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4007,47 +4007,58 @@ node_types:
         occurrences:
         - 1
         - 1
-    - dependency_cmaui_port_8:
+    - dependency_server_cmaui_4:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_cmaui_port_8:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_cmaui_4:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_cmaui:
+        - 0
+        - UNBOUNDED
+    - dependency_cmaui_port_8:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_cmaui_port_8:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
+        - 1
+        - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      feature_server_cmaui_4:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4063,61 +4074,59 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
+      disk.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_port_7:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      vcpus_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      binding_server_cmaui_4:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_cmaui:
+      disk.root.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_8:
+      disk.device.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_7:
+      attachment_cmaui_port_8:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_8:
-        type: tosca.capabilities.Attachment
+      scalable_server_cmaui_4:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -4127,121 +4136,110 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      disk.device.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      disk.device.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_cmaui_4:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_cmaui_4:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      network.incoming.packets.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      disk.device.allocation_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_7:
+      disk.write.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      disk.device.read.bytes_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_8:
+      memory_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.capacity_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_cmaui_4:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
@@ -4263,13 +4261,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_8:
+      instance_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      network.incoming.bytes.rate_cmaui_port_8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4281,24 +4279,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_server_cmaui:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4310,7 +4297,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.write.requests_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4329,6 +4316,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      disk.device.read.requests_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       binding_cmaui_port_8:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -4336,44 +4329,45 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      disk.iops_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.device.read.requests.rate_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      cpu.delta_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory.resident_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_7:
+      disk.ephemeral.size_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_8:
+      network.outgoing.bytes.rate_cmaui_port_7:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      network.incoming.bytes_cmaui_port_8:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -4383,7 +4377,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      disk.latency_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4395,13 +4389,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
+      disk.device.write.bytes.rate_server_cmaui_4:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      cpu_util_server_cmaui_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 42b1a26..4120554 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -85,9 +85,9 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -137,7 +137,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested1_group:
@@ -147,105 +147,111 @@ topology_template:
         description: nested1
       members:
       - cmaui_port_2
-      - server_cmaui
+      - server_cmaui_1
       - test_nested2Level
       - cmaui_port_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested1
     capabilities:
-      os_server_cmaui_test_nested2Level:
+      memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.device.allocation_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested3Level
+      - memory.resident_server_cmaui_3_test_nested3Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_6_test_nested3Level
       binding_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_6_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested3Level
-      disk.device.usage_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested3Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.latency
+      disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.root.size
+      scalable_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui
+      - scalable_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes
-      endpoint_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - endpoint_server_cmaui_test_nested3Level
+      disk.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.requests
       network.outgoing.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes
       binding_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_5_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_2
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - instance_server_cmaui_test_nested4Level_test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_3
-      feature_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - feature_server_cmaui_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.root.size_server_cmaui
-      disk.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests_server_cmaui_test_nested3Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes.rate
+      feature_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_2
+      disk.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes
+      disk.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested4Level_test_nested3Level
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_2
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      cpu.delta_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.bytes
+      disk.device.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested3Level
+      - disk.device.write.requests_server_cmaui_2
+      disk.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests.rate
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_6_test_nested3Level
+      disk.device.read.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes_server_cmaui_2
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_2
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_3
@@ -255,129 +261,105 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_5_test_nested3Level
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      memory.resident_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_2
       binding_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_7_test_nested4Level_test_nested3Level
-      os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - os_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_4
-      disk.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - scalable_server_cmaui_test_nested4Level_test_nested3Level
-      instance_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.allocation_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.allocation_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_1:
+      - server_cmaui_1
+      - disk.ephemeral.size
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      instance_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested4Level_test_nested3Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - instance_server_cmaui_3_test_nested3Level
       binding_cmaui_port_1:
       - cmaui_port_1
       - binding
       binding_cmaui_port_2:
       - cmaui_port_2
       - binding
-      binding_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested3Level
       feature_test_nested2Level:
       - test_nested2Level
       - feature
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      os_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - os_server_cmaui_test_nested3Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_3_test_nested3Level
+      disk.device.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests
+      cpu_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
+      - cpu_server_cmaui_3_test_nested3Level
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes.rate
+      cpu_util_server_cmaui_1:
+      - server_cmaui_1
+      - cpu_util
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level
       network.incoming.bytes_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level
       network.incoming.bytes_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.bytes
       network.incoming.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_5_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.bytes
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests_server_cmaui
       network.incoming.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets.rate
       network.incoming.packets.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level
@@ -387,402 +369,369 @@ topology_template:
       feature_cmaui_port_2:
       - cmaui_port_2
       - feature
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested2Level:
+      cpu_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.device.latency_server_cmaui_test_nested2Level:
+      - cpu_server_cmaui_2
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      - disk.ephemeral.size_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_1:
+      - server_cmaui_1
+      - binding
+      disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.root.size_server_cmaui_3_test_nested3Level
+      os_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - os_server_cmaui_3_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_1:
+      - server_cmaui_1
+      - scalable
+      disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.bytes_server_cmaui_3_test_nested3Level
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui_test_nested3Level
+      endpoint_server_cmaui_1:
+      - server_cmaui_1
+      - endpoint
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.requests.rate_server_cmaui_test_nested2Level:
+      os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - os_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.usage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_4
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      vcpus_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.read.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.requests.rate_server_cmaui_2
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested3Level
+      - disk.read.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.allocation
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_1:
+      - server_cmaui_1
+      - memory
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested3Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      endpoint_server_cmaui_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_3_test_nested3Level
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - endpoint_server_cmaui
+      - disk.write.requests.rate_server_cmaui_3_test_nested3Level
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      os_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - os_server_cmaui_2
       network.outgoing.bytes_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_5_test_nested3Level
-      cpu_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested3Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.read.requests_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.iops_server_cmaui_2
       network.incoming.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_4
       feature_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_3
+      disk.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_2
       network.outpoing.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_5_test_nested3Level
-      disk.root.size_server_cmaui_test_nested3Level_test_nested2Level:
+      instance_server_cmaui_1:
+      - server_cmaui_1
+      - instance
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.root.size_server_cmaui_test_nested3Level
-      memory.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      - instance_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested3Level
+      - memory_server_cmaui_3_test_nested3Level
       attachment_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_3
-      binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - binding_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.read.bytes_server_cmaui_test_nested3Level
-      instance_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - instance_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_1:
       - cmaui_port_1
       - network.outpoing.packets
       network.outpoing.packets_cmaui_port_2:
       - cmaui_port_2
       - network.outpoing.packets
+      disk.device.read.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests
+      cpu.delta_server_cmaui_1:
+      - server_cmaui_1
+      - cpu.delta
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.ephemeral.size_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.ephemeral.size_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested3Level
-      disk.device.allocation_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.allocation_server_cmaui
-      disk.device.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.iops_server_cmaui
-      binding_server_cmaui_test_nested2Level:
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - binding_server_cmaui
+      - disk.device.read.bytes_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.usage_server_cmaui_test_nested4Level_test_nested3Level
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - disk.device.allocation_server_cmaui_3_test_nested3Level
       feature_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested2Level:
+      cpu_util_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui
+      - cpu_util_server_cmaui_2
       attachment_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.write.requests_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory.usage_server_cmaui_2
+      disk.device.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.usage
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level
-      scalable_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      feature_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui_test_nested3Level
-      disk.read.bytes_server_cmaui_test_nested2Level:
+      - feature_server_cmaui_3_test_nested3Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes_server_cmaui
-      disk.device.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_3_test_nested3Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.latency_server_cmaui_test_nested3Level
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_3
-      disk.usage_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.device.write.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.read.requests_server_cmaui_2
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - feature_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested3Level
-      disk.capacity_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_2
+      disk.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.latency_server_cmaui_2
+      vcpus_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - vcpus_server_cmaui_3_test_nested3Level
+      disk.device.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.iops
       network.outgoing.bytes_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_4
-      disk.device.usage_server_cmaui_test_nested2Level:
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.usage_server_cmaui
-      disk.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.incoming.packets_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_5_test_nested3Level
-      cpu_util_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui_test_nested3Level
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      disk.latency_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.latency_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.write.bytes.rate_server_cmaui_2
+      disk.device.read.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.read.requests_server_cmaui_2
+      cpu_server_cmaui_1:
+      - server_cmaui_1
+      - cpu
+      memory.resident_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui_test_nested4Level_test_nested3Level
-      disk.capacity_server_cmaui_test_nested3Level_test_nested2Level:
+      - memory.resident_server_cmaui_2
+      disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.capacity_server_cmaui_test_nested3Level
-      disk.device.write.requests.rate_server_cmaui_test_nested2Level:
+      - disk.device.iops_server_cmaui_3_test_nested3Level
+      disk.allocation_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui
+      - disk.allocation_server_cmaui_2
       network.incoming.packets_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level
       network.incoming.packets_cmaui_port_1:
       - cmaui_port_1
       - network.incoming.packets
-      disk.device.read.bytes_server_cmaui_test_nested2Level:
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.write.requests_server_cmaui_3_test_nested3Level
+      disk.write.requests_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.write.requests_server_cmaui_2
+      disk.capacity_server_cmaui_1:
+      - server_cmaui_1
+      - disk.capacity
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested3Level
-      cpu_util_server_cmaui_test_nested2Level:
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - cpu_util_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level
       network.outpoing.packets_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_3
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.device.write.bytes_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui_test_nested3Level
-      host_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - host_server_cmaui
       network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_6_test_nested3Level
-      memory_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - memory_server_cmaui_test_nested3Level
       binding_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_4
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested3Level
+      - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_2
       network.incoming.packets.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_4
       feature_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested4Level_test_nested3Level
-      disk.latency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.latency_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.requests_server_cmaui_test_nested3Level
-      vcpus_server_cmaui_test_nested2Level:
+      disk.iops_server_cmaui_1:
+      - server_cmaui_1
+      - disk.iops
+      disk.device.usage_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - vcpus_server_cmaui
+      - disk.device.usage_server_cmaui_2
       feature_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level_test_nested2Level:
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.outgoing.bytes.rate
-      disk.iops_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.bytes.rate
       attachment_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_4
-      memory.usage_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - memory.usage_server_cmaui
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level
       network.outgoing.bytes.rate_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_4
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.read.requests_server_cmaui_test_nested2Level:
+      endpoint_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui
-      feature_server_cmaui_test_nested3Level_test_nested2Level:
+      - endpoint_server_cmaui_3_test_nested3Level
+      binding_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - feature_server_cmaui_test_nested3Level
-      memory_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - binding_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory_server_cmaui_test_nested4Level_test_nested3Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.iops_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.iops_server_cmaui_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.iops_server_cmaui_test_nested3Level
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_2
+      disk.write.bytes_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.bytes
+      feature_server_cmaui_1:
+      - server_cmaui_1
+      - feature
+      disk.allocation_server_cmaui_1:
+      - server_cmaui_1
+      - disk.allocation
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level
       attachment_cmaui_port_2:
       - cmaui_port_2
       - attachment
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      instance_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - instance_server_cmaui_2
       network.outgoing.packets.rate_cmaui_port_1:
       - cmaui_port_1
       - network.outgoing.packets.rate
@@ -792,39 +741,51 @@ topology_template:
       network.incoming.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets.rate_cmaui_port_3
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
-      disk.device.write.bytes_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      disk.device.read.requests_server_cmaui_test_nested3Level_test_nested2Level:
+      disk.write.requests_server_cmaui_1:
+      - server_cmaui_1
+      - disk.write.requests
+      disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.device.read.requests_server_cmaui_test_nested3Level
+      - disk.read.bytes_server_cmaui_3_test_nested3Level
+      cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_3_test_nested3Level
+      disk.usage_server_cmaui_1:
+      - server_cmaui_1
+      - disk.usage
       network.incoming.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes_cmaui_port_6_test_nested3Level
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - memory_server_cmaui_2
+      disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      scalable_server_cmaui_test_nested2Level:
+      - disk.usage_server_cmaui_3_test_nested3Level
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - scalable_server_cmaui
-      disk.usage_server_cmaui_test_nested2Level:
+      - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level
+      os_server_cmaui_1:
+      - server_cmaui_1
+      - os
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.root.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.usage_server_cmaui
+      - disk.root.size_server_cmaui_2
       feature_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_4
@@ -834,51 +795,72 @@ topology_template:
       attachment_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - attachment_cmaui_port_5_test_nested3Level
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - cpu_util_server_cmaui_3_test_nested3Level
+      disk.device.latency_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.device.latency_server_cmaui_2
+      disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level
-      memory.resident_server_cmaui_test_nested2Level:
+      - disk.allocation_server_cmaui_3_test_nested3Level
+      disk.ephemeral.size_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui
+      - disk.ephemeral.size_server_cmaui_2
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.capacity_server_cmaui_3_test_nested3Level
+      host_server_cmaui_1:
+      - server_cmaui_1
+      - host
       feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_7_test_nested4Level_test_nested3Level
-      host_server_cmaui_test_nested3Level_test_nested2Level:
+      binding_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - host_server_cmaui_test_nested3Level
+      - binding_server_cmaui_2
+      cpu.delta_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - cpu.delta_server_cmaui_2
       network.outpoing.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.outpoing.packets_cmaui_port_4
       binding_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - binding_cmaui_port_3
-      disk.device.write.requests_server_cmaui_test_nested2Level:
+      disk.device.capacity_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.device.write.requests_server_cmaui
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.read.bytes.rate_server_cmaui_test_nested2Level:
+      - disk.device.capacity_server_cmaui_2
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      disk.allocation_server_cmaui_test_nested2Level:
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level
+      memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - memory.usage_server_cmaui_3_test_nested3Level
+      scalable_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - scalable_server_cmaui_2
+      host_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - host_server_cmaui_3_test_nested3Level
+      disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      - disk.iops_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested4Level_test_nested3Level
+      - vcpus_server_cmaui_2
+      disk.device.read.requests.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.device.read.requests.rate
       network.outgoing.bytes_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes_cmaui_port_6_test_nested3Level
@@ -888,40 +870,58 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_2:
       - cmaui_port_2
       - network.incoming.bytes.rate
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu.delta_server_cmaui_test_nested2Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level
+      vcpus_server_cmaui_1:
+      - server_cmaui_1
+      - vcpus
+      disk.write.requests.rate_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - disk.write.requests.rate_server_cmaui_2
+      disk.write.bytes_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - cpu.delta_server_cmaui
+      - disk.write.bytes_server_cmaui_2
       feature_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_test_nested3Level
       feature_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - feature_cmaui_port_6_test_nested3Level
+      disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - disk.device.usage_server_cmaui_3_test_nested3Level
+      disk.read.bytes.rate_server_cmaui_1:
+      - server_cmaui_1
+      - disk.read.bytes.rate
       network.outgoing.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.outgoing.bytes.rate_cmaui_port_3
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - memory.resident_server_cmaui_test_nested4Level_test_nested3Level
+      - disk.device.capacity_server_cmaui_3_test_nested3Level
       network.incoming.bytes.rate_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - network.incoming.bytes.rate_cmaui_port_3
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
+      memory.resident_server_cmaui_1:
+      - server_cmaui_1
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level
-      disk.allocation_server_cmaui_test_nested3Level_test_nested2Level:
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level
+      disk.latency_server_cmaui_1:
+      - server_cmaui_1
+      - disk.latency
+      host_server_cmaui_2_test_nested2Level:
       - test_nested2Level
-      - disk.allocation_server_cmaui_test_nested3Level
+      - host_server_cmaui_2
+      memory.usage_server_cmaui_1:
+      - server_cmaui_1
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      local_storage_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_2
       link_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_5_test_nested3Level
@@ -946,42 +946,42 @@ topology_template:
       link_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_7_test_nested4Level_test_nested3Level
-      dependency_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui_test_nested4Level_test_nested3Level
       dependency_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_3
+      dependency_server_cmaui_2_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_2
+      local_storage_server_cmaui_3_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - local_storage_server_cmaui_3_test_nested3Level
       dependency_cmaui_port_1:
       - cmaui_port_1
       - dependency
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - dependency_server_cmaui_4_test_nested4Level_test_nested3Level
       link_cmaui_port_6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_6_test_nested3Level
-      dependency_server_cmaui_test_nested2Level:
-      - test_nested2Level
-      - dependency_server_cmaui
       dependency_cmaui_port_2:
       - cmaui_port_2
       - dependency
       link_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_4
-      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - dependency_cmaui_port_5_test_nested3Level
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      local_storage_server_cmaui_test_nested2Level:
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui
-      dependency_server_cmaui_test_nested3Level_test_nested2Level:
+      - local_storage_server_cmaui_4_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_3_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui_test_nested3Level
-      local_storage_server_cmaui_test_nested3Level_test_nested2Level:
+      - dependency_server_cmaui_3_test_nested3Level
+      local_storage_server_cmaui_1:
+      - server_cmaui_1
+      - local_storage
+      dependency_cmaui_port_5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - local_storage_server_cmaui_test_nested3Level
+      - dependency_cmaui_port_5_test_nested3Level
       link_cmaui_port_3_test_nested2Level:
       - test_nested2Level
       - link_cmaui_port_3
@@ -994,9 +994,9 @@ topology_template:
       dependency_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - dependency_test_nested3Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level:
-      - test_nested2Level
-      - local_storage_server_cmaui_test_nested4Level_test_nested3Level
+      dependency_server_cmaui_1:
+      - server_cmaui_1
+      - dependency
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - dependency_cmaui_port_4
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index c2319a0..2d592aa 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -86,8 +86,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_4:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -113,7 +126,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
@@ -133,19 +146,6 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -154,510 +154,495 @@ topology_template:
         description: nested2
       members:
       - cmaui_port_3
+      - server_cmaui_2
       - cmaui_port_4
       - test_nested3Level
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui_test_nested4Level
-      vcpus_server_cmaui_test_nested3Level:
+      instance_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - vcpus_server_cmaui
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      disk.latency_server_cmaui_test_nested3Level:
+      - instance_server_cmaui_4_test_nested4Level
+      memory.usage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui
-      disk.device.capacity_server_cmaui_test_nested4Level_test_nested3Level:
+      - memory.usage_server_cmaui_3
+      cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui_test_nested4Level
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
+      - cpu_util_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui_test_nested4Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
       network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.capacity_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_test_nested4Level
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      os_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.usage_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_test_nested4Level
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.requests_server_cmaui_3
+      disk.latency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui_test_nested4Level
-      memory.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_3
+      disk.write.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui_test_nested4Level
+      - disk.write.bytes.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      instance_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - instance_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui_test_nested3Level:
+      - cpu_util_server_cmaui_4_test_nested4Level
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.capacity_server_cmaui
+      - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
       feature_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      feature_server_cmaui_test_nested3Level:
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - feature_server_cmaui
+      - disk.device.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
-      memory.usage_server_cmaui_test_nested3Level:
+      host_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory.usage_server_cmaui
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      - host_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.ephemeral.size_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.read.bytes
-      binding_server_cmaui_test_nested3Level:
+      disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - binding_server_cmaui
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      memory_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_4_test_nested4Level
+      disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.root.size_server_cmaui_4_test_nested4Level
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui
+      - disk.iops_server_cmaui_4_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
+      memory_server_cmaui_2:
+      - server_cmaui_2
+      - memory
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      host_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - host_server_cmaui_3
       network.incoming.packets_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.allocation_server_cmaui_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
-      disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
       network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_7_test_nested4Level
-      disk.ephemeral.size_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.ephemeral.size_server_cmaui
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
-      disk.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_test_nested4Level
+      - disk.write.requests_server_cmaui_3
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      vcpus_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
       network.incoming.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_6
-      cpu_util_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui
       network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_8_test_nested4Level
-      endpoint_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
-      disk.allocation_server_cmaui_test_nested3Level:
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.allocation_server_cmaui
-      memory.resident_server_cmaui_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory.resident_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.read.bytes.rate_server_cmaui_3
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.ephemeral.size_server_cmaui_test_nested4Level
-      cpu.delta_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui
-      disk.device.read.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests_server_cmaui_test_nested4Level
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - cmaui_port_3
       - binding
-      disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes.rate_server_cmaui
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
       binding_cmaui_port_4:
       - cmaui_port_4
       - binding
-      disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui_test_nested4Level
-      endpoint_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui
-      disk.device.write.requests_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests_server_cmaui
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
       feature_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      memory_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
-      memory_server_cmaui_test_nested4Level_test_nested3Level:
+      feature_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - memory_server_cmaui_test_nested4Level
+      - feature_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.bytes.rate
-      disk.device.usage_server_cmaui_test_nested3Level:
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.usage_server_cmaui
+      - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes.rate
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      os_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_4_test_nested4Level
+      disk.device.write.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_3
       network.incoming.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes
-      disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.bytes
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      disk.root.size_server_cmaui_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
+      memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory.usage_server_cmaui_4_test_nested4Level
+      disk.device.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui
+      - disk.device.write.requests.rate_server_cmaui_3
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      disk.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.iops_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.incoming.packets.rate
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
       feature_cmaui_port_3:
       - cmaui_port_3
       - feature
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets.rate
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
       feature_cmaui_port_4:
       - cmaui_port_4
       - feature
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.packets.rate
-      disk.write.requests.rate_server_cmaui_test_nested3Level:
+      instance_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests.rate_server_cmaui
+      - instance_server_cmaui_3
       attachment_cmaui_port_3:
       - cmaui_port_3
       - attachment
-      disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
       - cmaui_port_4
       - attachment
-      disk.iops_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.iops_server_cmaui
-      host_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - host_server_cmaui_test_nested4Level
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.allocation_server_cmaui_test_nested3Level:
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests_server_cmaui_test_nested4Level
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      - disk.capacity_server_cmaui_4_test_nested4Level
       network.outgoing.packets.rate_cmaui_port_3:
       - cmaui_port_3
       - network.outgoing.packets.rate
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.device.iops_server_cmaui_test_nested3Level:
+      disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.iops_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_5
-      disk.allocation_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.allocation_server_cmaui_test_nested4Level
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      os_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - os_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_test_nested3Level:
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_3
+      disk.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_3
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.latency_server_cmaui
+      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
       binding_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_7_test_nested4Level
-      disk.root.size_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.root.size_server_cmaui_test_nested4Level
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      - disk.write.requests.rate_server_cmaui_3
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui_test_nested4Level
-      disk.read.requests_server_cmaui_test_nested3Level:
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui
+      - scalable_server_cmaui_4_test_nested4Level
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_test_nested4Level
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_test_nested4Level
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      feature_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_test_nested4Level
-      binding_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_server_cmaui_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.read.bytes_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes_server_cmaui_test_nested4Level
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      host_server_cmaui_test_nested3Level:
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - host_server_cmaui
-      scalable_server_cmaui_test_nested4Level_test_nested3Level:
+      - disk.latency_server_cmaui_4_test_nested4Level
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui_test_nested4Level
+      - disk.device.allocation_server_cmaui_3
       network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_5
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_4_test_nested4Level
+      disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests_server_cmaui_4_test_nested4Level
       network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_8_test_nested4Level
+      binding_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_3
       feature_test_nested3Level:
       - test_nested3Level
       - feature
-      disk.device.write.bytes_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
-      disk.read.bytes.rate_server_cmaui_test_nested3Level:
+      - cpu_server_cmaui_4_test_nested4Level
+      cpu.delta_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu.delta_server_cmaui_3
+      disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.bytes.rate_server_cmaui
-      disk.device.write.bytes.rate_server_cmaui_test_nested3Level:
+      - disk.device.capacity_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested3Level:
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.capacity_server_cmaui_test_nested3Level:
+      - attachment_cmaui_port_8_test_nested4Level
+      scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.capacity_server_cmaui
-      disk.usage_server_cmaui_test_nested4Level_test_nested3Level:
+      - scalable_server_cmaui_3
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
+      disk.device.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.usage_server_cmaui_test_nested4Level
+      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
-      disk.device.allocation_server_cmaui_test_nested4Level_test_nested3Level:
+      endpoint_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_3
+      vcpus_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.device.allocation_server_cmaui_test_nested4Level
+      - vcpus_server_cmaui_3
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_7_test_nested4Level
-      disk.write.requests_server_cmaui_test_nested3Level:
+      disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.requests_server_cmaui
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      - disk.allocation_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
       network.outgoing.bytes_cmaui_port_4:
       - cmaui_port_4
       - network.outgoing.bytes
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      instance_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - instance_server_cmaui
       binding_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_5
@@ -667,91 +652,106 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.bytes.rate
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
-      cpu_util_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_test_nested4Level
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      cpu_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui
-      disk.usage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested3Level:
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
+      disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - disk.write.bytes_server_cmaui
+      - disk.device.read.requests_server_cmaui_4_test_nested4Level
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_3:
       - cmaui_port_3
       - network.outpoing.packets
+      disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests_server_cmaui_4_test_nested4Level
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
       network.outpoing.packets_cmaui_port_4:
       - cmaui_port_4
       - network.outpoing.packets
+      binding_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
       binding_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_8_test_nested4Level
-      scalable_server_cmaui_test_nested3Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
-      - scalable_server_cmaui
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      disk.device.read.requests_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests_server_cmaui_3
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
-      cpu.delta_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu.delta_server_cmaui_test_nested4Level
       network.incoming.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_5
-      disk.device.iops_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_test_nested4Level
-      disk.write.bytes.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes.rate_server_cmaui
-      disk.device.read.requests.rate_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.read.requests_server_cmaui_test_nested4Level
+      - disk.ephemeral.size_server_cmaui_3
       network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_5
-      disk.latency_server_cmaui_test_nested4Level_test_nested3Level:
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - disk.latency_server_cmaui_test_nested4Level
+      - memory.resident_server_cmaui_3
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
       link_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_5
-      dependency_server_cmaui_test_nested3Level:
+      dependency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - dependency_server_cmaui_4_test_nested4Level
+      local_storage_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui
+      - local_storage_server_cmaui_3
       dependency_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_6
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
-      local_storage_server_cmaui_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui_test_nested4Level
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
       dependency_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_test_nested4Level
@@ -761,18 +761,18 @@ topology_template:
       link_cmaui_port_3:
       - cmaui_port_3
       - link
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level_test_nested3Level:
+      dependency_server_cmaui_3_test_nested3Level:
       - test_nested3Level
-      - dependency_server_cmaui_test_nested4Level
+      - dependency_server_cmaui_3
       link_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_6
       link_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - link_cmaui_port_8_test_nested4Level
+      local_storage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - local_storage_server_cmaui_4_test_nested4Level
       dependency_test_nested3Level:
       - test_nested3Level
       - dependency
@@ -782,6 +782,9 @@ topology_template:
       dependency_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       dependency_cmaui_port_4:
       - cmaui_port_4
       - dependency
@@ -790,7 +793,4 @@ topology_template:
       - dependency
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
-      local_storage_server_cmaui_test_nested3Level:
-      - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - dependency_cmaui_port_5
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index d907a4d..9bc5ccc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -74,6 +74,19 @@ topology_template:
           substitute_service_template: nested4ServiceTemplate.yaml
         p2:
           get_input: p2
+    server_cmaui_3:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_5:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -99,7 +112,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
     cmaui_port_6:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -126,21 +139,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_3
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested3_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -149,135 +149,144 @@ topology_template:
         description: nested3
       members:
       - test_nested4Level
+      - server_cmaui_3
       - cmaui_port_5
       - cmaui_port_6
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested3
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
-      memory_server_cmaui_test_nested4Level:
+      memory.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory_server_cmaui
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      instance_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - instance_server_cmaui
-      disk.root.size_server_cmaui_test_nested4Level:
+      - memory.usage_server_cmaui_4
+      cpu_util_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.root.size_server_cmaui
-      disk.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.bytes_server_cmaui
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
-      cpu_server_cmaui_test_nested4Level:
+      - cpu_util_server_cmaui_4
+      disk.device.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.usage
+      disk.device.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.latency
+      disk.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_server_cmaui
-      vcpus_server_cmaui_test_nested4Level:
+      - disk.read.requests_server_cmaui_4
+      disk.root.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests.rate
+      disk.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - vcpus_server_cmaui
-      disk.device.usage_server_cmaui_test_nested4Level:
+      - disk.write.bytes.rate_server_cmaui_4
+      disk.latency_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.usage_server_cmaui
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - disk.latency_server_cmaui_4
+      disk.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.requests
+      disk.device.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.iops
+      disk.device.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes.rate
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_7
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.latency_server_cmaui_test_nested4Level:
+      feature_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.latency_server_cmaui
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
-      disk.device.capacity_server_cmaui_test_nested4Level:
+      - feature_server_cmaui_4
+      disk.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.capacity_server_cmaui
+      - disk.capacity_server_cmaui_4
+      disk.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes.rate_cmaui_port_8
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      host_server_cmaui_test_nested4Level:
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - host_server_cmaui
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
-      disk.device.read.requests.rate_server_cmaui_test_nested4Level:
+      - disk.device.write.bytes.rate_server_cmaui_4
+      disk.device.read.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests.rate_server_cmaui
+      - disk.device.read.requests_server_cmaui_4
+      disk.device.write.requests_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests.rate
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.requests.rate_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.read.bytes_server_cmaui_4
+      disk.device.read.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.bytes
+      memory_server_cmaui_3:
+      - server_cmaui_3
+      - memory
+      memory.resident_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - memory.resident_server_cmaui_4
+      cpu_server_cmaui_3:
+      - server_cmaui_3
+      - cpu
+      binding_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - binding_server_cmaui_4
       network.incoming.packets_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets
+      os_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - os_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_7
-      disk.allocation_server_cmaui_test_nested4Level:
+      disk.ephemeral.size_server_cmaui_3:
+      - server_cmaui_3
+      - disk.ephemeral.size
+      cpu.delta_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.allocation_server_cmaui
+      - cpu.delta_server_cmaui_4
       network.incoming.packets_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets
-      disk.device.write.bytes.rate_server_cmaui_test_nested4Level:
+      disk.capacity_server_cmaui_3:
+      - server_cmaui_3
+      - disk.capacity
+      disk.device.capacity_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.bytes.rate_server_cmaui
+      - disk.device.capacity_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_7
-      disk.device.write.bytes_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.bytes_server_cmaui
-      disk.device.write.requests.rate_server_cmaui_test_nested4Level:
+      scalable_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.write.requests.rate_server_cmaui
-      disk.device.iops_server_cmaui_test_nested4Level:
+      - scalable_server_cmaui_4
+      disk.device.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.iops_server_cmaui
-      disk.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.iops_server_cmaui_4
+      disk.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.requests_server_cmaui
-      disk.ephemeral.size_server_cmaui_test_nested4Level:
+      - disk.read.bytes.rate_server_cmaui_4
+      endpoint_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.ephemeral.size_server_cmaui
-      binding_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - binding_server_cmaui
+      - endpoint_server_cmaui_4
       network.outgoing.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes_cmaui_port_8
-      disk.usage_server_cmaui_test_nested4Level:
+      vcpus_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.usage_server_cmaui
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - vcpus_server_cmaui_4
       binding_cmaui_port_5:
       - cmaui_port_5
       - binding
@@ -287,21 +296,21 @@ topology_template:
       binding_cmaui_port_6:
       - cmaui_port_6
       - binding
+      disk.device.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.requests
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
-      feature_server_cmaui_test_nested4Level:
+      disk.write.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - feature_server_cmaui
-      disk.read.bytes.rate_server_cmaui_test_nested4Level:
+      - disk.write.bytes_server_cmaui_4
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes.rate_server_cmaui
+      - disk.write.requests.rate_server_cmaui_4
+      disk.iops_server_cmaui_3:
+      - server_cmaui_3
+      - disk.iops
       network.outgoing.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes.rate
@@ -314,75 +323,78 @@ topology_template:
       network.incoming.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.capacity_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.capacity_server_cmaui
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
-      scalable_server_cmaui_test_nested4Level:
+      host_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - scalable_server_cmaui
+      - host_server_cmaui_4
+      cpu_util_server_cmaui_3:
+      - server_cmaui_3
+      - cpu_util
+      disk.device.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes.rate
+      disk.write.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.write.bytes
       network.incoming.bytes_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_8
       network.outpoing.packets_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_8
-      disk.device.read.bytes.rate_server_cmaui_test_nested4Level:
+      disk.iops_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes.rate_server_cmaui
+      - disk.iops_server_cmaui_4
+      feature_server_cmaui_3:
+      - server_cmaui_3
+      - feature
       feature_cmaui_port_5:
       - cmaui_port_5
       - feature
-      disk.device.allocation_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.allocation_server_cmaui
       feature_cmaui_port_6:
       - cmaui_port_6
       - feature
-      disk.device.write.requests_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.device.write.requests_server_cmaui
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui_test_nested4Level:
+      cpu_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.bytes.rate_server_cmaui
+      - cpu_server_cmaui_4
       attachment_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_7
-      disk.write.requests.rate_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.write.requests.rate_server_cmaui
       binding_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_8
+      disk.write.bytes_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.bytes
       network.incoming.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.packets.rate
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      disk.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.allocation
       attachment_cmaui_port_6:
       - cmaui_port_6
       - attachment
+      binding_server_cmaui_3:
+      - server_cmaui_3
+      - binding
+      vcpus_server_cmaui_3:
+      - server_cmaui_3
+      - vcpus
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outgoing.packets.rate_cmaui_port_7
+      instance_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - instance_server_cmaui_4
       network.outgoing.packets.rate_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.packets.rate
+      scalable_server_cmaui_3:
+      - server_cmaui_3
+      - scalable
       network.outgoing.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.packets.rate
@@ -392,166 +404,154 @@ topology_template:
       feature_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_8
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      disk.write.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.write.requests
       network.outpoing.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.outpoing.packets_cmaui_port_7
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
       attachment_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - attachment_cmaui_port_8
+      disk.usage_server_cmaui_3:
+      - server_cmaui_3
+      - disk.usage
+      disk.device.write.bytes_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.write.bytes_server_cmaui_4
       network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.outgoing.bytes.rate_cmaui_port_8
-      disk.iops_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - disk.iops_server_cmaui
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
       feature_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - feature_cmaui_port_7
-      endpoint_server_cmaui_test_nested4Level:
+      endpoint_server_cmaui_3:
+      - server_cmaui_3
+      - endpoint
+      memory_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - endpoint_server_cmaui
+      - memory_server_cmaui_4
       network.incoming.packets.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
-      cpu.delta_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - cpu.delta_server_cmaui
-      memory.resident_server_cmaui_test_nested4Level:
+      os_server_cmaui_3:
+      - server_cmaui_3
+      - os
+      disk.root.size_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - memory.resident_server_cmaui
+      - disk.root.size_server_cmaui_4
       binding_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - binding_cmaui_port_7
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      disk.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - network.outgoing.bytes_cmaui_port_7
-      disk.read.bytes_server_cmaui_test_nested4Level:
+      - disk.usage_server_cmaui_4
+      disk.device.latency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.device.latency_server_cmaui_4
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.read.bytes_server_cmaui
-      disk.device.read.requests_server_cmaui_test_nested4Level:
+      - disk.device.read.requests.rate_server_cmaui_4
+      disk.ephemeral.size_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.ephemeral.size_server_cmaui_4
+      disk.device.allocation_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.allocation
+      disk.read.bytes_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.requests_server_cmaui
-      disk.write.requests_server_cmaui_test_nested4Level:
+      - disk.read.bytes_server_cmaui_4
+      disk.allocation_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - disk.allocation_server_cmaui_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - network.outgoing.bytes_cmaui_port_7
+      disk.device.allocation_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.write.requests_server_cmaui
-      disk.device.latency_server_cmaui_test_nested4Level:
+      - disk.device.allocation_server_cmaui_4
+      host_server_cmaui_3:
+      - server_cmaui_3
+      - host
+      disk.write.requests_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.latency_server_cmaui
+      - disk.write.requests_server_cmaui_4
       network.incoming.packets_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets_cmaui_port_7
       feature_test_nested4Level:
       - test_nested4Level
       - feature
-      os_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - os_server_cmaui
       network.incoming.bytes.rate_cmaui_port_6:
       - cmaui_port_6
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      instance_server_cmaui_3:
+      - server_cmaui_3
+      - instance
       network.incoming.packets.rate_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - network.incoming.packets.rate_cmaui_port_8
-      memory.usage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - memory.usage_server_cmaui
       network.outpoing.packets_cmaui_port_5:
       - cmaui_port_5
       - network.outpoing.packets
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
       network.outgoing.bytes_cmaui_port_6:
       - cmaui_port_6
       - network.outgoing.bytes
       network.outpoing.packets_cmaui_port_6:
       - cmaui_port_6
       - network.outpoing.packets
+      disk.read.bytes.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.read.bytes.rate
       network.outgoing.bytes_cmaui_port_5:
       - cmaui_port_5
       - network.outgoing.bytes
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.device.read.bytes_server_cmaui_test_nested4Level:
+      disk.device.usage_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - disk.device.read.bytes_server_cmaui
-      cpu_util_server_cmaui_test_nested4Level:
+      - disk.device.usage_server_cmaui_4
+      disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level:
       - test_nested4Level
-      - cpu_util_server_cmaui
+      - disk.device.read.bytes.rate_server_cmaui_4
       network.incoming.bytes.rate_cmaui_port_5:
       - cmaui_port_5
       - network.incoming.bytes.rate
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      disk.device.read.requests_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests
       network.incoming.bytes_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - network.incoming.bytes_cmaui_port_7
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      disk.device.read.requests.rate_server_cmaui_3:
+      - server_cmaui_3
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_3:
+      - server_cmaui_3
+      - cpu.delta
+      memory.resident_server_cmaui_3:
+      - server_cmaui_3
+      - memory.resident
+      disk.latency_server_cmaui_3:
+      - server_cmaui_3
+      - disk.latency
+      memory.usage_server_cmaui_3:
+      - server_cmaui_3
+      - memory.usage
     requirements:
       dependency_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_7
+      local_storage_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - local_storage_server_cmaui_4
       dependency_cmaui_port_6:
       - cmaui_port_6
       - dependency
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
       dependency_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - dependency_cmaui_port_8
-      local_storage_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - local_storage_server_cmaui
+      local_storage_server_cmaui_3:
+      - server_cmaui_3
+      - local_storage
       link_cmaui_port_6:
       - cmaui_port_6
       - link
@@ -564,15 +564,15 @@ topology_template:
       link_cmaui_port_8_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_8
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
-      dependency_server_cmaui_test_nested4Level:
-      - test_nested4Level
-      - dependency_server_cmaui
       link_cmaui_port_7_test_nested4Level:
       - test_nested4Level
       - link_cmaui_port_7
+      dependency_server_cmaui_4_test_nested4Level:
+      - test_nested4Level
+      - dependency_server_cmaui_4
+      dependency_server_cmaui_3:
+      - server_cmaui_3
+      - dependency
       dependency_cmaui_port_5:
       - cmaui_port_5
       - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index 720662b..c5b92cb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -84,8 +84,21 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
+    server_cmaui_4:
+      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+      properties:
+        flavor:
+          get_input: cmaui_flavor
+        availability_zone:
+          get_input: availability_zone_0
+        image:
+          get_input: cmaui_image
+        name:
+          get_input:
+          - cmaui_names
+          - 0
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -112,21 +125,8 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_4
           relationship: tosca.relationships.network.BindsTo
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
-      properties:
-        flavor:
-          get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
-          - cmaui_names
-          - 0
   groups:
     nested4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -135,119 +135,119 @@ topology_template:
         description: nested4
       members:
       - cmaui_port_7
+      - server_cmaui_4
       - cmaui_port_8
-      - server_cmaui
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested4
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes
+      disk.device.write.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes
+      feature_server_cmaui_4:
+      - server_cmaui_4
+      - feature
+      disk.device.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.latency
+      disk.device.usage_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.usage
       feature_cmaui_port_7:
       - cmaui_port_7
       - feature
       feature_cmaui_port_8:
       - cmaui_port_8
       - feature
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.requests
+      disk.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.allocation
       network.outgoing.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.packets.rate
       attachment_cmaui_port_7:
       - cmaui_port_7
       - attachment
+      vcpus_server_cmaui_4:
+      - server_cmaui_4
+      - vcpus
+      binding_server_cmaui_4:
+      - server_cmaui_4
+      - binding
+      disk.root.size_server_cmaui_4:
+      - server_cmaui_4
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests.rate
       attachment_cmaui_port_8:
       - cmaui_port_8
       - attachment
+      scalable_server_cmaui_4:
+      - server_cmaui_4
+      - scalable
       network.outgoing.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.packets.rate
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests
+      disk.usage_server_cmaui_4:
+      - server_cmaui_4
       - disk.usage
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      disk.device.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.capacity
+      disk.device.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.iops
+      disk.device.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_4:
+      - server_cmaui_4
+      - endpoint
+      disk.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes
       network.incoming.packets.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets.rate
-      memory_server_cmaui:
-      - server_cmaui
-      - memory
+      os_server_cmaui_4:
+      - server_cmaui_4
+      - os
       network.incoming.packets.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.packets.rate
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      disk.device.allocation_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.requests.rate
+      disk.device.read.bytes_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.bytes
+      memory_server_cmaui_4:
+      - server_cmaui_4
+      - memory
+      disk.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.write.bytes.rate
+      cpu_server_cmaui_4:
+      - server_cmaui_4
+      - cpu
+      disk.capacity_server_cmaui_4:
+      - server_cmaui_4
+      - disk.capacity
+      host_server_cmaui_4:
+      - server_cmaui_4
+      - host
       network.incoming.packets_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.packets
@@ -257,53 +257,53 @@ topology_template:
       network.incoming.bytes.rate_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes.rate
+      instance_server_cmaui_4:
+      - server_cmaui_4
+      - instance
       network.incoming.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes.rate
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
       network.outgoing.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.outgoing.bytes
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       network.outpoing.packets_cmaui_port_7:
       - cmaui_port_7
       - network.outpoing.packets
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      disk.read.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.read.bytes.rate
       network.outpoing.packets_cmaui_port_8:
       - cmaui_port_8
       - network.outpoing.packets
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      disk.device.write.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.requests
       binding_cmaui_port_7:
       - cmaui_port_7
       - binding
       network.outgoing.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes
+      disk.device.read.requests_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests
       binding_cmaui_port_8:
       - cmaui_port_8
       - binding
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
+      disk.iops_server_cmaui_4:
+      - server_cmaui_4
+      - disk.iops
+      disk.device.read.requests.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.read.requests.rate
+      cpu.delta_server_cmaui_4:
+      - server_cmaui_4
+      - cpu.delta
+      memory.resident_server_cmaui_4:
+      - server_cmaui_4
+      - memory.resident
+      disk.ephemeral.size_server_cmaui_4:
+      - server_cmaui_4
       - disk.ephemeral.size
       network.outgoing.bytes.rate_cmaui_port_7:
       - cmaui_port_7
@@ -311,24 +311,24 @@ topology_template:
       network.incoming.bytes_cmaui_port_8:
       - cmaui_port_8
       - network.incoming.bytes
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
       network.incoming.bytes_cmaui_port_7:
       - cmaui_port_7
       - network.incoming.bytes
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      disk.latency_server_cmaui_4:
+      - server_cmaui_4
+      - disk.latency
       network.outgoing.bytes.rate_cmaui_port_8:
       - cmaui_port_8
       - network.outgoing.bytes.rate
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.device.write.bytes.rate_server_cmaui_4:
+      - server_cmaui_4
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_4:
+      - server_cmaui_4
+      - memory.usage
+      cpu_util_server_cmaui_4:
+      - server_cmaui_4
+      - cpu_util
     requirements:
       dependency_cmaui_port_8:
       - cmaui_port_8
@@ -342,9 +342,9 @@ topology_template:
       link_cmaui_port_7:
       - cmaui_port_7
       - link
-      dependency_server_cmaui:
-      - server_cmaui
+      dependency_server_cmaui_4:
+      - server_cmaui_4
       - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
+      local_storage_server_cmaui_4:
+      - server_cmaui_4
       - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
index c73fcf6..d59f16e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested1.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_1:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
index b4655fa..dca4585 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested2.yml
@@ -47,7 +47,7 @@ resources:
       security_groups: [{get_param: p1}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
index 5553883..157b085 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested3.yml
@@ -48,7 +48,7 @@ resources:
       security_groups: [{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_3:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
index ce3ffb7..0e689ef 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/inputfiles/nested4.yml
@@ -46,7 +46,7 @@ resources:
       security_groups: [{get_param: p2},{get_param: p2}]
       replacement_policy: AUTO
 
-  server_cmaui:
+  server_cmaui_4:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}