forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

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

1 files changed, 261 insertions, 243 deletions

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 33ae55e5cd..67af3b2fa7 100644
--- 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
@@ -160,27 +160,12 @@ topology_template:
       cpu_util_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu_util_server_cmaui_3
-      disk.device.usage_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.usage_cmaui
-      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.usage_server_cmaui_4_test_nested4Level
       disk.device.latency_server_cmaui_2:
       - abstract_cmaui_1
       - disk.device.latency_cmaui
-      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_7_test_nested4Level
-      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_4_test_nested4Level
       disk.root.size_server_cmaui_2:
       - abstract_cmaui_1
       - disk.root.size_cmaui
-      disk.device.write.requests.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.requests.rate_cmaui
       disk.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.requests_server_cmaui_3
@@ -193,33 +178,15 @@ topology_template:
       network.outgoing.bytes_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_3
-      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - endpoint_server_cmaui_4_test_nested4Level
       disk.read.requests_server_cmaui_2:
       - abstract_cmaui_1
       - disk.read.requests_cmaui
-      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_util_server_cmaui_4_test_nested4Level
       disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes.rate_server_cmaui_4_test_nested4Level
-      feature_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_test_nested4Level
-      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
-      disk.device.iops_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.iops_cmaui
       disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.bytes_server_cmaui_4_test_nested4Level
-      disk.device.capacity_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.capacity_cmaui
       attachment_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_7_test_nested4Level
@@ -253,33 +220,15 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_5
-      memory_server_cmaui_2:
-      - abstract_cmaui_1
-      - memory_cmaui
-      cpu_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu_cmaui
       host_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - host_server_cmaui_3
-      network.incoming.packets_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.packets_cmaui_cmaui_port_3
       disk.allocation_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_3
-      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - memory_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.packets_cmaui_cmaui_port_4
       network.outgoing.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_6
-      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
       network.incoming.packets.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets.rate_cmaui_port_6
@@ -295,15 +244,6 @@ topology_template:
       network.outpoing.packets_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_5
-      disk.capacity_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.capacity_cmaui
-      network.incoming.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_6
-      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_8_test_nested4Level
       network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_6
@@ -313,15 +253,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes.rate_server_cmaui_3
-      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_4_test_nested4Level
       binding_cmaui_port_3:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_3
-      disk.iops_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.iops_cmaui
       binding_cmaui_port_4:
       - abstract_cmaui_1
       - binding_cmaui_cmaui_port_4
@@ -337,6 +271,264 @@ topology_template:
       memory_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - memory_server_cmaui_3
+      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_3
+      binding_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_6
+      disk.usage_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_3
+      network.incoming.bytes_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_4
+      network.incoming.bytes_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.bytes_cmaui_cmaui_port_3
+      disk.device.latency_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_3
+      cpu_util_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu_util_cmaui
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes.rate_cmaui
+      disk.write.bytes.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.write.bytes.rate_cmaui
+      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - vcpus_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.bytes_cmaui
+      network.incoming.packets.rate_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_3
+      cpu_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_3
+      feature_cmaui_port_3:
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_3
+      network.incoming.packets.rate_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.packets.rate_cmaui_cmaui_port_4
+      feature_cmaui_port_4:
+      - abstract_cmaui_1
+      - feature_cmaui_cmaui_port_4
+      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_4_test_nested4Level
+      binding_server_cmaui_2:
+      - abstract_cmaui_1
+      - binding_cmaui
+      scalable_server_cmaui_2:
+      - abstract_cmaui_1
+      - scalable_cmaui
+      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
+      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_5
+      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_7_test_nested4Level
+      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
+      endpoint_server_cmaui_2:
+      - abstract_cmaui_1
+      - endpoint_cmaui
+      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.read.requests_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_4:
+      - abstract_cmaui_1
+      - forwarder_cmaui_cmaui_port_4
+      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - scalable_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_3:
+      - abstract_cmaui_1
+      - forwarder_cmaui_cmaui_port_3
+      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
+      disk.device.allocation_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.allocation_cmaui
+      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.latency_server_cmaui_4_test_nested4Level
+      disk.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.read.bytes_server_cmaui_3
+      disk.device.allocation_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.allocation_server_cmaui_3
+      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes.rate_cmaui_port_5
+      os_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - os_server_cmaui_3
+      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_8_test_nested4Level
+      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_server_cmaui_4_test_nested4Level
+      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
+      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - attachment_cmaui_port_8_test_nested4Level
+      instance_server_cmaui_2:
+      - abstract_cmaui_1
+      - instance_cmaui
+      disk.device.iops_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_3
+      network.incoming.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_5
+      network.outpoing.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.outpoing.packets_cmaui_port_6
+      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
+      binding_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_5
+      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.bytes_server_cmaui_3
+      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_5
+      disk.device.read.requests_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.read.requests_cmaui
+      network.outpoing.packets_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.outpoing.packets_cmaui_cmaui_port_3
+      disk.capacity_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.capacity_server_cmaui_3
+      cpu.delta_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu.delta_cmaui
+      network.outpoing.packets_cmaui_port_4:
+      - 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
+      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
+      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - binding_cmaui_port_8_test_nested4Level
+      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.write.bytes_server_cmaui_4_test_nested4Level
+      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.packets.rate_cmaui_port_5
+      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
+      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - disk.device.read.bytes_server_cmaui_3
+      memory.resident_server_cmaui_3_test_nested3Level:
+      - test_nested3Level
+      - memory.resident_server_cmaui_3
+      disk.device.usage_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.usage_cmaui
+      disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.usage_server_cmaui_4_test_nested4Level
+      network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_7_test_nested4Level
+      disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.usage_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
+      disk.device.write.requests.rate_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.write.requests.rate_cmaui
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
+      endpoint_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - endpoint_server_cmaui_4_test_nested4Level
+      cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - cpu_util_server_cmaui_4_test_nested4Level
+      feature_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - feature_test_nested4Level
+      network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.iops_cmaui
+      disk.device.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.device.capacity_cmaui
+      memory_server_cmaui_2:
+      - abstract_cmaui_1
+      - memory_cmaui
+      cpu_server_cmaui_2:
+      - abstract_cmaui_1
+      - cpu_cmaui
+      network.incoming.packets_cmaui_port_3:
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_3
+      memory_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - memory_server_cmaui_4_test_nested4Level
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
+      network.incoming.packets_cmaui_port_4:
+      - abstract_cmaui_1
+      - network.incoming.packets_cmaui_cmaui_port_4
+      network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.outgoing.bytes_cmaui_port_7_test_nested4Level
+      disk.capacity_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.capacity_cmaui
+      network.incoming.packets_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.packets_cmaui_port_6
+      network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - network.incoming.bytes_cmaui_port_8_test_nested4Level
+      disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - disk.device.iops_server_cmaui_4_test_nested4Level
+      disk.iops_server_cmaui_2:
+      - abstract_cmaui_1
+      - disk.iops_cmaui
       network.incoming.bytes.rate_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_6
@@ -346,42 +538,21 @@ topology_template:
       network.outgoing.bytes.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_3
-      disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_3
       disk.root.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.root.size_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes.rate_cmaui_cmaui_port_4
-      binding_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_6
-      disk.usage_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.usage_server_cmaui_3
       os_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - os_server_cmaui_4_test_nested4Level
       disk.device.write.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_3
-      network.incoming.bytes_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.bytes_cmaui_cmaui_port_4
-      network.incoming.bytes_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.bytes_cmaui_cmaui_port_3
       disk.device.read.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests.rate_server_cmaui_3
-      disk.device.latency_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_3
-      cpu_util_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu_util_cmaui
       memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui_4_test_nested4Level
@@ -391,51 +562,24 @@ topology_template:
       network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.bytes.rate_cmaui
-      disk.write.bytes.rate_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.write.bytes.rate_cmaui
       disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level
-      vcpus_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - vcpus_server_cmaui_4_test_nested4Level
       network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outpoing.packets_cmaui_port_8_test_nested4Level
-      disk.device.write.bytes_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.write.bytes_cmaui
       feature_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - feature_cmaui_port_7_test_nested4Level
       disk.iops_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.iops_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.incoming.packets.rate_cmaui_cmaui_port_3
-      cpu_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_3
-      feature_cmaui_port_3:
-      - abstract_cmaui_1
-      - feature_cmaui_cmaui_port_3
       disk.write.bytes_server_cmaui_2:
       - abstract_cmaui_1
       - disk.write.bytes_cmaui
-      network.incoming.packets.rate_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.incoming.packets.rate_cmaui_cmaui_port_4
       feature_server_cmaui_2:
       - abstract_cmaui_1
       - feature_cmaui
-      feature_cmaui_port_4:
-      - abstract_cmaui_1
-      - feature_cmaui_cmaui_port_4
       attachment_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_6
@@ -445,12 +589,6 @@ topology_template:
       disk.allocation_server_cmaui_2:
       - abstract_cmaui_1
       - disk.allocation_cmaui
-      disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_4_test_nested4Level
-      binding_server_cmaui_2:
-      - abstract_cmaui_1
-      - binding_cmaui
       vcpus_server_cmaui_2:
       - abstract_cmaui_1
       - vcpus_cmaui
@@ -466,12 +604,6 @@ topology_template:
       attachment_cmaui_port_4:
       - abstract_cmaui_1
       - attachment_cmaui_cmaui_port_4
-      scalable_server_cmaui_2:
-      - abstract_cmaui_1
-      - scalable_cmaui
-      disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.requests.rate_server_cmaui_4_test_nested4Level
       disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.capacity_server_cmaui_4_test_nested4Level
@@ -481,18 +613,12 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.bytes.rate_server_cmaui_3
-      network.incoming.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_5
       disk.write.requests_server_cmaui_2:
       - abstract_cmaui_1
       - disk.write.requests_cmaui
       memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - memory.resident_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui_2:
       - abstract_cmaui_1
       - disk.usage_cmaui
@@ -502,9 +628,6 @@ topology_template:
       disk.write.bytes_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.bytes_server_cmaui_3
-      feature_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - feature_server_cmaui_4_test_nested4Level
       network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level
@@ -514,66 +637,30 @@ topology_template:
       disk.write.requests.rate_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.write.requests.rate_server_cmaui_3
-      disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_4_test_nested4Level
-      endpoint_server_cmaui_2:
-      - abstract_cmaui_1
-      - endpoint_cmaui
       network.incoming.bytes_cmaui_port_6_test_nested3Level:
       - test_nested3Level
       - network.incoming.bytes_cmaui_port_6
       os_server_cmaui_2:
       - abstract_cmaui_1
       - os_cmaui
-      disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.read.requests_server_cmaui_4_test_nested4Level
-      scalable_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - scalable_server_cmaui_4_test_nested4Level
-      network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets.rate_cmaui_port_8_test_nested4Level
       attachment_cmaui_port_5_test_nested3Level:
       - test_nested3Level
       - attachment_cmaui_port_5
-      disk.device.allocation_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.allocation_cmaui
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level
-      disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.latency_server_cmaui_4_test_nested4Level
-      disk.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.read.bytes_server_cmaui_3
       disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.latency_server_cmaui_4_test_nested4Level
-      disk.device.allocation_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.allocation_server_cmaui_3
-      network.incoming.bytes.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_5
       host_server_cmaui_2:
       - abstract_cmaui_1
       - host_cmaui
-      os_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - os_server_cmaui_3
       disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.read.bytes_server_cmaui_4_test_nested4Level
       disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.write.requests_server_cmaui_4_test_nested4Level
-      network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.packets_cmaui_port_8_test_nested4Level
       binding_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_3
@@ -583,36 +670,18 @@ topology_template:
       network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level
-      cpu_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - cpu_server_cmaui_4_test_nested4Level
       cpu.delta_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui_3
       disk.device.capacity_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.capacity_server_cmaui_3
-      disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level
-      attachment_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - attachment_cmaui_port_8_test_nested4Level
       scalable_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - scalable_server_cmaui_3
-      instance_server_cmaui_2:
-      - abstract_cmaui_1
-      - instance_cmaui
-      disk.device.iops_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.iops_server_cmaui_3
       network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level
-      network.incoming.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes_cmaui_port_5
       endpoint_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - endpoint_server_cmaui_3
@@ -625,75 +694,33 @@ topology_template:
       disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.allocation_server_cmaui_4_test_nested4Level
-      network.outpoing.packets_cmaui_port_6_test_nested3Level:
-      - test_nested3Level
-      - network.outpoing.packets_cmaui_port_6
       network.outgoing.bytes_cmaui_port_4:
       - abstract_cmaui_1
       - network.outgoing.bytes_cmaui_cmaui_port_4
-      network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level
-      binding_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_5
       network.incoming.bytes.rate_cmaui_port_3:
       - abstract_cmaui_1
       - network.incoming.bytes.rate_cmaui_cmaui_port_3
       network.incoming.bytes.rate_cmaui_port_4:
       - abstract_cmaui_1
       - network.incoming.bytes.rate_cmaui_cmaui_port_4
-      disk.device.write.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.bytes_server_cmaui_3
-      network.outgoing.bytes_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.bytes_cmaui_port_5
-      disk.device.read.requests_server_cmaui_2:
-      - abstract_cmaui_1
-      - disk.device.read.requests_cmaui
       disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_4_test_nested4Level
       disk.read.bytes.rate_server_cmaui_2:
       - abstract_cmaui_1
       - disk.read.bytes.rate_cmaui
-      network.outpoing.packets_cmaui_port_3:
-      - abstract_cmaui_1
-      - network.outpoing.packets_cmaui_cmaui_port_3
       disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - disk.device.write.requests_server_cmaui_4_test_nested4Level
-      disk.capacity_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.capacity_server_cmaui_3
-      cpu.delta_server_cmaui_2:
-      - abstract_cmaui_1
-      - cpu.delta_cmaui
       disk.device.read.requests.rate_server_cmaui_2:
       - abstract_cmaui_1
       - disk.device.read.requests.rate_cmaui
-      network.outpoing.packets_cmaui_port_4:
-      - abstract_cmaui_1
-      - network.outpoing.packets_cmaui_cmaui_port_4
       binding_server_cmaui_4_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - binding_server_cmaui_4_test_nested4Level
-      network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level
       memory.resident_server_cmaui_2:
       - abstract_cmaui_1
       - memory.resident_cmaui
-      disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level
-      binding_cmaui_port_8_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - binding_cmaui_port_8_test_nested4Level
-      disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level:
-      - test_nested3Level
-      - disk.write.bytes_server_cmaui_4_test_nested4Level
       disk.device.read.requests_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.device.read.requests_server_cmaui_3
@@ -709,18 +736,9 @@ topology_template:
       disk.ephemeral.size_server_cmaui_3_test_nested3Level:
       - test_nested3Level
       - disk.ephemeral.size_server_cmaui_3
-      network.outgoing.packets.rate_cmaui_port_5_test_nested3Level:
-      - test_nested3Level
-      - network.outgoing.packets.rate_cmaui_port_5
-      disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level:
+      forwarder_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level
-      disk.device.read.bytes_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - disk.device.read.bytes_server_cmaui_3
-      memory.resident_server_cmaui_3_test_nested3Level:
-      - test_nested3Level
-      - memory.resident_server_cmaui_3
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui_2:
       - abstract_cmaui_1
       - memory.usage_cmaui
@@ -784,4 +802,4 @@ topology_template:
       - dependency_cmaui_cmaui_port_3
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5