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>

12 files changed, 3044 insertions, 3044 deletions

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 e138b3d4cd..8dc7b43734 100644
--- 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 a90a5ca88e..d957b399c8 100644
--- 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 a90a5ca88e..68c93f53d3 100644
--- 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 9b397c6fd7..59312c6bba 100644
--- 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 32fbdf01c7..12d24c9a64 100644
--- 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:
+      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
-      disk.ephemeral.size_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
-      cpu.delta_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.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.
+      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:
+      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
-      disk.usage_server_main_pd_1b:
+      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
-      memory.resident_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
-      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,97 +3687,83 @@ 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:
+      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.read.bytes.rate_server_main_1c1_cmaui_2:
+      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
-      disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_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:
         - 1
         - UNBOUNDED
-      disk.device.read.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.
+      binding_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1_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
-      binding_server_pd_pattern4_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
+      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:
@@ -3889,137 +3775,143 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_main_1c1_cmaui_1:
+      network.incoming.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
-      disk.device.iops_server_main_1c1_cmaui_2:
+      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
-      network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
+      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
-      disk.device.iops_server_main_pd_1b:
+      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
+      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.write.requests.rate_server_main_pd_1b:
+      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
-      binding_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
+      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:
         - 0
         - UNBOUNDED
-      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.
+      feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_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:
         - 1
         - UNBOUNDED
-      attachment_pd_server_main_1b_port:
-        type: tosca.capabilities.Attachment
+      disk.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_ps_server_main_1b_port:
-        type: tosca.capabilities.Node
+      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
-      disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
+      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
-      disk.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.
+      os_server_main_ps_1b_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_nested2_ps_1b_test_nested2Level:
+      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
-      feature_ps_server_nested2_1b_port_test_nested2Level:
-        type: tosca.capabilities.Node
+      attachment_ps_server_main_1b_port_1:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_main_pd_1b:
+      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
-      network.incoming.bytes.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.
+      feature_ps_server_nested2_1b_port_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_main_pd_1b:
+      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
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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
+      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.requests_server_main_ps_1b:
+      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
+      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,50 +4624,49 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_main_1b_port:
+      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:
         - 1
         - UNBOUNDED
-      instance_server_main_ps_1b:
+      memory.resident_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.resident_server_nested2_1c1_cmaui_1_test_nested2Level:
+      vcpus_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
-      vcpus_server_nested2_ps_1b_test_nested2Level:
+      disk.device.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.device.iops_server_nested2_1c1_cmaui_2_test_nested2Level:
+      network.incoming.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.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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
-      host_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      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
-      network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      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:
@@ -4664,72 +4677,67 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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
-      disk.root.size_server_main_pd_1b:
+      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_1:
+      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
-      memory_server_main_1c1_cmaui_2:
+      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_main_pd_1b:
+      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.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_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.iops_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.latency_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_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_nested2_1c1_cmaui_1_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
-      disk.capacity_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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
-      feature_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Node
-        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
-      network.incoming.bytes_pd_server_main_1b_port:
+      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
+      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
+      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
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      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
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_nested2_test_nested2Level:
-        type: tosca.capabilities.Attachment
+      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
-      network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_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
-      memory.resident_server_pd_pattern4_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
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_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
-      disk.device.usage_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_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
-      network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
+      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
-      disk.device.read.requests.rate_server_pd_pattern4_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
-      network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_main_1:
+      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
-      binding_server_main_pd_1b:
-        type: tosca.capabilities.network.Bindable
+      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.read.bytes_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.
+      endpoint_server_nested2_ps_1b_test_nested2Level:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_nested2_ps_1b_test_nested2Level:
+      attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      disk.device.read.requests_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
-      cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level:
+      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
-      memory_server_nested2_1c1_cmaui_2_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
-      attachment_ps_server_main_1b_port:
-        type: tosca.capabilities.Attachment
+      feature_jsa_security_group1_test_resourceGroup_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
+      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.root.size_server_nested2_pd_1b_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
-      endpoint_server_nested2_ps_1b_test_nested2Level:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
+      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.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
+      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.device.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
+      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
-      disk.write.requests_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_jsa_security_group2_test_nested3Level_test_nested2Level:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_jsa_security_group1_test_resourceGroup_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      network.outgoing.bytes.rate_ps_server_main_1b_port:
+      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
-      cpu_server_main_ps_1b:
+      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.device.usage_server_nested2_ps_1b_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
-      disk.iops_server_nested2_1c1_cmaui_2_test_nested2Level:
+      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
-      memory_server_pd_pattern4_test_nested_pattern_4_main_1:
+      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
-      feature_jsa_security_group2_test_nested3Level_test_nested2Level:
-        type: tosca.capabilities.Node
+      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
-      network.incoming.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
+      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.allocation_server_pd_pattern4_test_nested_pattern_4_main_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_1:
+      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.write.requests.rate_server_main_1c1_cmaui_2:
+      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.latency_server_main_ps_1b:
+      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,12 +6212,25 @@ 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.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.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.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2_test_nested2Level:
+      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:
@@ -6139,31 +6242,46 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pd_server_main_1b_port:
+      feature_cmaui_port_12:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_cmaui_port_11:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
+      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
-      vcpus_server_main_1c1_cmaui_2:
+      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
-      memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
+      os_server_main_1c1_cmaui_21:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      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
-      vcpus_server_main_1c1_cmaui_1:
+      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:
@@ -6180,30 +6298,47 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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
       feature_cmaui_port_2_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_main_1c1_cmaui_1:
+      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.write.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
-      disk.latency_server_main_1c1_cmaui_2:
+      scalable_server_main_pd_1b_1:
+        type: tosca.capabilities.Scalable
+        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.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
+      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:
+        - 1
+        - UNBOUNDED
+      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:
@@ -6215,6 +6350,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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
+      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
       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.
@@ -6233,12 +6380,18 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      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_pd_server_nested2_1b_port_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_ps_server_main_1b_port:
+      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:
@@ -6251,35 +6404,31 @@ node_types:
         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
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_server_main_1c1_cmaui_1:
-        type: tosca.capabilities.network.Bindable
+      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
-      instance_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_server_main_1c1_cmaui_2:
-        type: tosca.capabilities.network.Bindable
+      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:
         - 1
         - UNBOUNDED
-      feature_server_main_ps_1b:
-        type: tosca.capabilities.Node
+      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
-      memory_server_pd_pattern4_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
+      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:
@@ -6291,26 +6440,26 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_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.device.write.bytes_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
-      feature_server_pd_pattern4_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Node
+      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.device.write.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.
+      feature_server_pd_pattern4_test_nested_pattern_4_main_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
@@ -6319,7 +6468,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_main_1b_port:
+      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:
@@ -6338,63 +6487,29 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      host_server_main_ps_1b:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_main_ps_1b:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       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.root.size_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.root.size_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.write.bytes_server_main_1c1_cmaui_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
-      vcpus_server_main_ps_1b:
+      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
-      attachment_pd_server_pattern4_port_2_test_nested_pattern_4_main_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_cmaui_port_2:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       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.
@@ -6419,47 +6534,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       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
-      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.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
-      attachment_cmaui_port_1:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.write.bytes.rate_server_main_1c1_cmaui_1:
+      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
-      os_server_main_ps_1b:
-        type: tosca.capabilities.OperatingSystem
-        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:
@@ -7979,12 +7981,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.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
       network.outgoing.bytes.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.
@@ -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,25 +9350,25 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_nested2:
+      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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_nested2_pd_1b:
+      disk.write.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.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_nested2_1c1_cmaui_2:
+      network.outgoing.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.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
+      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:
@@ -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 3e27a96590..43aeb451a9 100644
--- 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 b489bc4c05..4439f4e1e8 100644
--- 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 c4c0dccb77..150bc51517 100644
--- 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 91a958fe18..26fcd68463 100644
--- 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 b202e39caa..34a80a963a 100644
--- 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 cc6778d633..f4bca8d6e4 100644
--- 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:
+      - 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
-      os_server_main_pd_1b:
-      - abstract_pd_server_main_1b
-      - os_pd_server_main_1b
-      memory.resident_server_main_1c1_cmaui_1:
-      - 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
+      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
-      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
       - 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:
-      - 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:
+      network.incoming.packets_ps_server_main_1b_port_1:
       - 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:
-      - abstract_cmaui_1c1_main
-      - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
-      network.incoming.bytes.rate_cmaui_port_2:
+      disk.device.capacity_server_main_1c1_cmaui_21:
       - 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:
-      - abstract_pd_server_main_1b
-      - vcpus_pd_server_main_1b
-      host_server_main_pd_1b:
+      feature_server_main_pd_1b_1:
       - 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:
-      - 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:
+      disk.write.bytes.rate_server_pd_pattern4_1_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:
-      - abstract_cmaui_1c1_main
-      - disk.device.read.requests.rate_cmaui_1c1_main
-      disk.device.read.requests.rate_server_main_1c1_cmaui_1:
+      disk.capacity_server_main_1c1_cmaui_21:
       - 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 c851f7f561..326bdcf8f3 100644
--- 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