Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[SDC] Onboarding 1710 rebase.
[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / nestedSingleCompute / nestedMultiLevels / out / nested2ServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index c2319a0..c3425ca 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -6,9 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-node_types:
-  org.openecomp.resource.vfc.nodes.heat.cmaui:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
     cmaui_names:
@@ -60,61 +57,6 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_3:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        replacement_policy: AUTO
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        security_groups:
-        - get_input: p2
-        - get_input: p1
-        fixed_ips:
-        - ip_address:
-            get_input:
-            - cmaui_oam_ips
-            - 0
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: net
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
-    cmaui_port_4:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        replacement_policy: AUTO
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        security_groups:
-        - get_input: p1
-        fixed_ips:
-        - ip_address:
-            get_input:
-            - cmaui_oam_ips
-            - 0
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: net
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
-          relationship: tosca.relationships.network.BindsTo
     test_nested3Level:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -133,19 +75,70 @@ topology_template:
           - SELF
           - service_template_filter
           - index_value
-    server_cmaui:
-      type: org.openecomp.resource.vfc.nodes.heat.cmaui
+    abstract_cmaui_1:
+      type: org.openecomp.resource.abstract.nodes.cmaui_1
+      directives:
+      - substitutable
       properties:
-        flavor:
+        port_cmaui_port_3_mac_requirements:
+          mac_count_required:
+            is_required: false
+        vm_flavor_name:
           get_input: cmaui_flavor
-        availability_zone:
-          get_input: availability_zone_0
-        image:
-          get_input: cmaui_image
-        name:
-          get_input:
+        compute_cmaui_name:
+        - get_input:
           - cmaui_names
           - 0
+        port_cmaui_port_4_fixed_ips:
+        - ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 0
+        compute_cmaui_availability_zone:
+        - get_input: availability_zone_0
+        port_cmaui_port_4_security_groups:
+        - - get_input: p1
+        vm_image_name:
+          get_input: cmaui_image
+        port_cmaui_port_3_fixed_ips:
+        - ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 0
+        port_cmaui_port_4_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_cmaui_port_3_network:
+        - get_input: net
+        port_cmaui_port_3_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_cmaui_port_4_replacement_policy:
+        - AUTO
+        port_cmaui_port_3_replacement_policy:
+        - AUTO
+        port_cmaui_port_4_network:
+        - get_input: net
+        port_cmaui_port_4_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_cmaui_port_3_security_groups:
+        - - get_input: p2
+          - get_input: p1
+        service_template_filter:
+          substitute_service_template: Nested_cmaui_1ServiceTemplate.yaml
+          count: 1
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
   groups:
     nested2_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -153,19 +146,17 @@ topology_template:
         heat_file: ../Artifacts/nested2.yml
         description: nested2
       members:
-      - cmaui_port_3
-      - cmaui_port_4
       - test_nested3Level
-      - server_cmaui
+      - abstract_cmaui_1
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested2
     capabilities:
       cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
+      - abstract_cmaui_1
+      - cpu.delta_cmaui
       disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
+      - abstract_cmaui_1
+      - disk.device.write.requests.rate_cmaui
       disk.write.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_test_nested4Level
@@ -173,8 +164,8 @@ topology_template:
       - test_nested3Level
       - vcpus_server_cmaui
       disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      - abstract_cmaui_1
+      - disk.device.allocation_cmaui
       disk.latency_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui
@@ -182,11 +173,11 @@ topology_template:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_test_nested4Level
       scalable_server_cmaui:
-      - server_cmaui
-      - scalable
+      - abstract_cmaui_1
+      - scalable_cmaui
       disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
+      - abstract_cmaui_1
+      - disk.read.bytes.rate_cmaui
       memory.resident_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_test_nested4Level
@@ -197,11 +188,11 @@ topology_template:
       - test_nested3Level
       - disk.capacity_server_cmaui_test_nested4Level
       host_server_cmaui:
-      - server_cmaui
-      - host
+      - abstract_cmaui_1
+      - host_cmaui
       cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      - abstract_cmaui_1
+      - cpu_util_cmaui
       os_server_cmaui_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui
@@ -215,11 +206,11 @@ topology_template:
       - test_nested3Level
       - memory.usage_server_cmaui_test_nested4Level
       network.outgoing.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes
+      - abstract_cmaui_1
+      - network.outgoing.bytes_cmaui_cmaui_port_3
       disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
+      - abstract_cmaui_1
+      - disk.device.write.requests_cmaui
       instance_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui_test_nested4Level
@@ -248,17 +239,17 @@ topology_template:
       - test_nested3Level
       - memory.usage_server_cmaui
       instance_server_cmaui:
-      - server_cmaui
-      - instance
+      - abstract_cmaui_1
+      - instance_cmaui
       disk.device.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes
+      - abstract_cmaui_1
+      - disk.device.read.bytes_cmaui
       binding_server_cmaui_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui
       disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
+      - abstract_cmaui_1
+      - disk.root.size_cmaui
       memory_server_cmaui_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui
@@ -266,17 +257,17 @@ topology_template:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
       network.incoming.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_3
       os_server_cmaui:
-      - server_cmaui
-      - os
+      - abstract_cmaui_1
+      - os_cmaui
       disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      - abstract_cmaui_1
+      - disk.device.write.bytes.rate_cmaui
       network.incoming.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_4
       disk.device.latency_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui_test_nested4Level
@@ -338,17 +329,17 @@ topology_template:
       - test_nested3Level
       - disk.write.requests_server_cmaui_test_nested4Level
       feature_server_cmaui:
-      - server_cmaui
-      - feature
+      - abstract_cmaui_1
+      - feature_cmaui
       binding_cmaui_port_3:
-      - cmaui_port_3
-      - binding
+      - abstract_cmaui_1
+      - binding_cmaui_cmaui_port_3
       disk.device.read.bytes.rate_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui
       binding_cmaui_port_4:
-      - cmaui_port_4
-      - binding
+      - abstract_cmaui_1
+      - binding_cmaui_cmaui_port_4
       disk.device.write.requests_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_test_nested4Level
@@ -359,8 +350,8 @@ topology_template:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui
       memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      - abstract_cmaui_1
+      - memory.usage_cmaui
       feature_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_6
@@ -368,8 +359,8 @@ topology_template:
       - test_nested3Level
       - feature_cmaui_port_8_test_nested4Level
       disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      - abstract_cmaui_1
+      - disk.ephemeral.size_cmaui
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
@@ -377,35 +368,35 @@ topology_template:
       - test_nested3Level
       - memory_server_cmaui_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.bytes.rate
+      - abstract_cmaui_1
+      - network.outgoing.bytes.rate_cmaui_cmaui_port_3
       disk.device.usage_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.device.usage_server_cmaui
       network.outgoing.bytes.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.outgoing.bytes.rate
+      - abstract_cmaui_1
+      - network.outgoing.bytes.rate_cmaui_cmaui_port_4
       binding_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - binding_cmaui_port_6
       disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
+      - abstract_cmaui_1
+      - disk.iops_cmaui
       network.incoming.bytes_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.bytes
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_4
       disk.iops_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_test_nested4Level
       network.incoming.bytes_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_3
       disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
+      - abstract_cmaui_1
+      - disk.device.iops_cmaui
       disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      - abstract_cmaui_1
+      - disk.read.bytes_cmaui
       disk.root.size_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui
@@ -422,26 +413,26 @@ topology_template:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
       cpu_server_cmaui:
-      - server_cmaui
-      - cpu
+      - abstract_cmaui_1
+      - cpu_cmaui
       network.incoming.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.packets.rate
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_3
       feature_cmaui_port_3:
-      - cmaui_port_3
-      - feature
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_3
       network.incoming.packets.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.packets.rate
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_4
       feature_cmaui_port_4:
-      - cmaui_port_4
-      - feature
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_4
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
       disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
+      - abstract_cmaui_1
+      - disk.write.bytes.rate_cmaui
       disk.device.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_test_nested4Level
@@ -449,23 +440,23 @@ topology_template:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_6
       disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
+      - abstract_cmaui_1
+      - disk.device.read.bytes.rate_cmaui
       network.outgoing.packets.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.outgoing.packets.rate
+      - abstract_cmaui_1
+      - network.outgoing.packets.rate_cmaui_cmaui_port_4
       disk.write.requests.rate_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui
       attachment_cmaui_port_3:
-      - cmaui_port_3
-      - attachment
+      - abstract_cmaui_1
+      - attachment_cmaui_cmaui_port_3
       disk.write.bytes_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_test_nested4Level
       attachment_cmaui_port_4:
-      - cmaui_port_4
-      - attachment
+      - abstract_cmaui_1
+      - attachment_cmaui_cmaui_port_4
       disk.iops_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui
@@ -473,11 +464,11 @@ topology_template:
       - test_nested3Level
       - host_server_cmaui_test_nested4Level
       disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
+      - abstract_cmaui_1
+      - disk.device.latency_cmaui
       disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
+      - abstract_cmaui_1
+      - disk.read.requests_cmaui
       disk.device.allocation_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.device.allocation_server_cmaui
@@ -485,17 +476,17 @@ topology_template:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_test_nested4Level
       disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
+      - abstract_cmaui_1
+      - disk.device.capacity_cmaui
       disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      - abstract_cmaui_1
+      - disk.usage_cmaui
       network.outgoing.packets.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.outgoing.packets.rate
+      - abstract_cmaui_1
+      - network.outgoing.packets.rate_cmaui_cmaui_port_3
       disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
+      - abstract_cmaui_1
+      - disk.device.usage_cmaui
       disk.device.iops_server_cmaui_test_nested3Level:
       - test_nested3Level
       - disk.device.iops_server_cmaui
@@ -506,11 +497,11 @@ topology_template:
       - test_nested3Level
       - disk.allocation_server_cmaui_test_nested4Level
       disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
+      - abstract_cmaui_1
+      - disk.capacity_cmaui
       disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
+      - abstract_cmaui_1
+      - disk.write.requests.rate_cmaui
       os_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_test_nested4Level
@@ -530,14 +521,14 @@ topology_template:
       - test_nested3Level
       - disk.root.size_server_cmaui_test_nested4Level
       disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
+      - abstract_cmaui_1
+      - disk.device.read.requests_cmaui
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
       memory_server_cmaui:
-      - server_cmaui
-      - memory
+      - abstract_cmaui_1
+      - memory_cmaui
       disk.read.bytes.rate_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_test_nested4Level
@@ -548,8 +539,8 @@ topology_template:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
       binding_server_cmaui:
-      - server_cmaui
-      - binding
+      - abstract_cmaui_1
+      - binding_cmaui
       disk.device.usage_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.usage_server_cmaui_test_nested4Level
@@ -563,8 +554,8 @@ topology_template:
       - test_nested3Level
       - attachment_cmaui_port_5
       disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
+      - abstract_cmaui_1
+      - disk.device.read.requests.rate_cmaui
       feature_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_server_cmaui_test_nested4Level
@@ -578,8 +569,8 @@ topology_template:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_test_nested4Level
       disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
+      - abstract_cmaui_1
+      - disk.write.bytes_cmaui
       host_server_cmaui_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui
@@ -623,8 +614,8 @@ topology_template:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
       memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
+      - abstract_cmaui_1
+      - memory.resident_cmaui
       network.incoming.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_5
@@ -638,23 +629,23 @@ topology_template:
       - test_nested3Level
       - disk.write.requests_server_cmaui
       disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      - abstract_cmaui_1
+      - disk.latency_cmaui
       network.outpoing.packets_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_6
       vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
+      - abstract_cmaui_1
+      - vcpus_cmaui
       network.outgoing.bytes_cmaui_port_4:
-      - cmaui_port_4
-      - network.outgoing.bytes
+      - abstract_cmaui_1
+      - network.outgoing.bytes_cmaui_cmaui_port_4
       network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
       disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
+      - abstract_cmaui_1
+      - disk.device.write.bytes_cmaui
       instance_server_cmaui_test_nested3Level:
       - test_nested3Level
       - instance_server_cmaui
@@ -662,11 +653,11 @@ topology_template:
       - test_nested3Level
       - binding_cmaui_port_5
       network.incoming.bytes.rate_cmaui_port_3:
-      - cmaui_port_3
-      - network.incoming.bytes.rate
+      - abstract_cmaui_1
+      - network.incoming.bytes.rate_cmaui_cmaui_port_3
       network.incoming.bytes.rate_cmaui_port_4:
-      - cmaui_port_4
-      - network.incoming.bytes.rate
+      - abstract_cmaui_1
+      - network.incoming.bytes.rate_cmaui_cmaui_port_4
       network.outgoing.bytes_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_5
@@ -674,11 +665,11 @@ topology_template:
       - test_nested3Level
       - cpu_util_server_cmaui_test_nested4Level
       disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
+      - abstract_cmaui_1
+      - disk.allocation_cmaui
       disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
+      - abstract_cmaui_1
+      - disk.write.requests_cmaui
       cpu_server_cmaui_test_nested3Level:
       - test_nested3Level
       - cpu_server_cmaui
@@ -689,11 +680,11 @@ topology_template:
       - test_nested3Level
       - disk.write.bytes_server_cmaui
       network.outpoing.packets_cmaui_port_3:
-      - cmaui_port_3
-      - network.outpoing.packets
+      - abstract_cmaui_1
+      - network.outpoing.packets_cmaui_cmaui_port_3
       network.outpoing.packets_cmaui_port_4:
-      - cmaui_port_4
-      - network.outpoing.packets
+      - abstract_cmaui_1
+      - network.outpoing.packets_cmaui_cmaui_port_4
       network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
@@ -704,8 +695,8 @@ topology_template:
       - test_nested3Level
       - scalable_server_cmaui
       endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
+      - abstract_cmaui_1
+      - endpoint_cmaui
       feature_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_5
@@ -744,8 +735,8 @@ topology_template:
       - test_nested3Level
       - dependency_cmaui_port_6
       dependency_server_cmaui:
-      - server_cmaui
-      - dependency
+      - abstract_cmaui_1
+      - dependency_cmaui
       dependency_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_7_test_nested4Level
@@ -756,14 +747,14 @@ topology_template:
       - test_nested3Level
       - dependency_test_nested4Level
       link_cmaui_port_4:
-      - cmaui_port_4
-      - link
+      - abstract_cmaui_1
+      - link_cmaui_cmaui_port_4
       link_cmaui_port_3:
-      - cmaui_port_3
-      - link
+      - abstract_cmaui_1
+      - link_cmaui_cmaui_port_3
       local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
+      - abstract_cmaui_1
+      - local_storage_cmaui
       dependency_server_cmaui_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - dependency_server_cmaui_test_nested4Level
@@ -783,14 +774,14 @@ topology_template:
       - test_nested3Level
       - dependency_cmaui_port_8_test_nested4Level
       dependency_cmaui_port_4:
-      - cmaui_port_4
-      - dependency
+      - abstract_cmaui_1
+      - dependency_cmaui_cmaui_port_4
       dependency_cmaui_port_3:
-      - cmaui_port_3
-      - dependency
+      - abstract_cmaui_1
+      - dependency_cmaui_cmaui_port_3
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - dependency_cmaui_port_5
       local_storage_server_cmaui_test_nested3Level:
       - test_nested3Level
-      - local_storage_server_cmaui
\ No newline at end of file
+      - local_storage_server_cmaui
SDC Parent Project Catalog FE and BE