forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

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

25 files changed, 569 insertions, 25 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index e597cd7ff1..0f15ce0877 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -607,6 +607,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -778,4 +788,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index bd995dbf48..9d41cfd560 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -455,6 +455,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -566,4 +572,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - local_storage
\ No newline at end of file
+      - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f349889ec2..3aba31e26e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -234,6 +234,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -386,4 +391,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index c84ce20669..70f0e2ebbc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -186,6 +186,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -276,4 +279,4 @@ topology_template:
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
-      - link
\ No newline at end of file
+      - link
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index f349889ec2..3aba31e26e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -234,6 +234,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -386,4 +391,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
index c84ce20669..70f0e2ebbc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -186,6 +186,9 @@ topology_template:
       disk.device.read.bytes_server_cmaui:
       - server_cmaui
       - disk.device.read.bytes
+      forwarder_cmaui_port_0:
+      - cmaui_port_0
+      - forwarder
       memory_server_cmaui:
       - server_cmaui
       - memory
@@ -276,4 +279,4 @@ topology_template:
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
-      - link
\ No newline at end of file
+      - link
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 3fc881856b..4ae2e898e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -426,6 +426,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -679,6 +684,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -805,6 +815,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_3_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1104,6 +1119,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1585,6 +1605,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1968,12 +1993,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2062,6 +2097,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_server_cmaui4_test_nested2Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -3605,6 +3645,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4025,12 +4075,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory_server_cmaui4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4135,6 +4195,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.packets_cmaui_port_4:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -4836,6 +4901,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_5_test_nested3Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       memory.usage_server_cmaui6_test_nested3Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5056,12 +5126,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_7_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.capacity_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8_test_nested4Level:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8_test_nested4Level:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -5442,6 +5522,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.read.bytes_server_cmaui6:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6773,6 +6863,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_8:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.allocation_server_cmaui8:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -6955,4 +7055,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
index 0ff3b96235..a815a7d021 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml
@@ -233,6 +233,9 @@ topology_template:
       disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.allocation_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_4_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_4
       network.incoming.packets_cmaui_port_4_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_4
@@ -362,6 +365,9 @@ topology_template:
       disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.bytes_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_5_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_5_test_nested3Level
       disk.write.requests.rate_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.write.requests.rate_server_cmaui5_test_nested3Level
@@ -425,6 +431,9 @@ topology_template:
       disk.device.read.bytes.rate_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.bytes.rate_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_3_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_3
       network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level
@@ -578,6 +587,9 @@ topology_template:
       cpu.delta_server_cmaui6_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - cpu.delta_server_cmaui6_test_nested3Level
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level
       disk.device.latency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.latency_server_cmaui5_test_nested3Level
@@ -824,6 +836,9 @@ topology_template:
       disk.read.bytes.rate_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.read.bytes.rate_server_cmaui4
+      forwarder_cmaui_port_6_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_6_test_nested3Level
       memory_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - memory_server_cmaui8_test_nested4Level_test_nested3Level
@@ -1019,9 +1034,15 @@ topology_template:
       os_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - os_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
       disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level_test_nested2Level:
       - test_nested2Level
       - disk.device.read.requests.rate_server_cmaui8_test_nested4Level_test_nested3Level
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -1067,6 +1088,9 @@ topology_template:
       endpoint_server_cmaui2:
       - server_cmaui2
       - endpoint
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level:
+      - test_nested2Level
+      - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level
       disk.capacity_server_cmaui4_test_nested2Level:
       - test_nested2Level
       - disk.capacity_server_cmaui4
@@ -1529,4 +1553,4 @@ topology_template:
       - dependency_cmaui_port_4
       dependency_server_cmaui5_test_nested3Level_test_nested2Level:
       - test_nested2Level
-      - dependency_server_cmaui5_test_nested3Level
\ No newline at end of file
+      - dependency_server_cmaui5_test_nested3Level
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
index b6c066b812..44ebbfff92 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml
@@ -481,6 +481,12 @@ topology_template:
       cpu.delta_server_cmaui8_test_nested4Level_test_nested3Level:
       - test_nested3Level
       - cpu.delta_server_cmaui8_test_nested4Level
+      forwarder_cmaui_port_4:
+      - cmaui_port_4
+      - forwarder
+      forwarder_cmaui_port_3:
+      - cmaui_port_3
+      - forwarder
       disk.device.latency_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.device.latency_server_cmaui6
@@ -694,9 +700,15 @@ topology_template:
       memory_server_cmaui3:
       - server_cmaui3
       - memory
+      forwarder_cmaui_port_6_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_6
       memory_server_cmaui4:
       - server_cmaui4
       - memory
+      forwarder_cmaui_port_7_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_7_test_nested4Level
       disk.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - disk.usage_server_cmaui6
@@ -751,6 +763,9 @@ topology_template:
       disk.allocation_server_cmaui3:
       - server_cmaui3
       - disk.allocation
+      forwarder_cmaui_port_8_test_nested4Level_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_8_test_nested4Level
       network.incoming.packets_cmaui_port_4:
       - cmaui_port_4
       - network.incoming.packets
@@ -1108,6 +1123,9 @@ topology_template:
       disk.device.read.requests.rate_server_cmaui3:
       - server_cmaui3
       - disk.device.read.requests.rate
+      forwarder_cmaui_port_5_test_nested3Level:
+      - test_nested3Level
+      - forwarder_cmaui_port_5
       memory.usage_server_cmaui6_test_nested3Level:
       - test_nested3Level
       - memory.usage_server_cmaui6
@@ -1189,4 +1207,4 @@ topology_template:
       - link_cmaui_port_7_test_nested4Level
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
index 920856d15d..738262e312 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml
@@ -189,9 +189,15 @@ topology_template:
       host_server_cmaui6:
       - server_cmaui6
       - host
+      forwarder_cmaui_port_7_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_7
       disk.device.capacity_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.capacity_server_cmaui8
+      forwarder_cmaui_port_8_test_nested4Level:
+      - test_nested4Level
+      - forwarder_cmaui_port_8
       disk.device.allocation_server_cmaui8_test_nested4Level:
       - test_nested4Level
       - disk.device.allocation_server_cmaui8
@@ -387,6 +393,12 @@ topology_template:
       memory.resident_server_cmaui7_test_nested4Level:
       - test_nested4Level
       - memory.resident_server_cmaui7
+      forwarder_cmaui_port_6:
+      - cmaui_port_6
+      - forwarder
+      forwarder_cmaui_port_5:
+      - cmaui_port_5
+      - forwarder
       disk.device.read.bytes_server_cmaui6:
       - server_cmaui6
       - disk.device.read.bytes
@@ -843,4 +855,4 @@ topology_template:
       - dependency
       dependency_server_cmaui6:
       - server_cmaui6
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
index d518dc0cf4..c7e191959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml
@@ -368,6 +368,12 @@ topology_template:
       disk.device.capacity_server_cmaui7:
       - server_cmaui7
       - disk.device.capacity
+      forwarder_cmaui_port_8:
+      - cmaui_port_8
+      - forwarder
+      forwarder_cmaui_port_7:
+      - cmaui_port_7
+      - forwarder
       disk.device.allocation_server_cmaui8:
       - server_cmaui8
       - disk.device.allocation
@@ -485,4 +491,4 @@ topology_template:
       - dependency
       dependency_server_cmaui8:
       - server_cmaui8
-      - dependency
\ No newline at end of file
+      - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d971de1e5..2d6cfe6cb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -554,6 +554,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -725,4 +735,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
index 72de5fec5d..23f6189612 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -380,6 +380,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -491,4 +497,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - local_storage
\ No newline at end of file
+      - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d971de1e5..2d6cfe6cb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -554,6 +554,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_cmaui_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_cmaui_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.usage_server_cmaui1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -725,4 +735,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
\ No newline at end of file
+        - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
index 72de5fec5d..23f6189612 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -380,6 +380,12 @@ topology_template:
       disk.read.bytes_server_cmaui1:
       - server_cmaui1
       - disk.read.bytes
+      forwarder_cmaui_port_2:
+      - cmaui_port_2
+      - forwarder
+      forwarder_cmaui_port_1:
+      - cmaui_port_1
+      - forwarder
       disk.device.usage_server_cmaui1:
       - server_cmaui1
       - disk.device.usage
@@ -491,4 +497,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui1:
       - server_cmaui1
-      - local_storage
\ No newline at end of file
+      - local_storage