forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

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

2 files changed, 26 insertions, 2 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
index 6cfd40fb6b..f400f5025c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml
@@ -260,6 +260,9 @@ topology_template:
       disk.device.latency_CPM:
       - CPM
       - disk.device.latency
+      forwarder_cpm_mgt_0_port:
+      - cpm_mgt_0_port
+      - forwarder
       feature_CPM:
       - CPM
       - feature
@@ -314,6 +317,9 @@ topology_template:
       network.incoming.packets_cpm_mgt_0_port:
       - cpm_mgt_0_port
       - network.incoming.packets
+      forwarder_cpm_ctrl_fabric_0_port:
+      - cpm_ctrl_fabric_0_port
+      - forwarder
       feature_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_port
       - feature
@@ -404,4 +410,4 @@ topology_template:
       - link
       link_cpm_ctrl_fabric_0_port:
       - cpm_ctrl_fabric_0_port
-      - 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/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
index fda8b20838..b384057c2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml
@@ -343,6 +343,9 @@ topology_template:
       binding_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - binding
+      forwarder_iom_data_0_port:
+      - iom_data_0_port
+      - forwarder
       disk.read.bytes_IOM:
       - IOM
       - disk.read.bytes
@@ -412,6 +415,9 @@ topology_template:
       disk.write.requests.rate_IOM:
       - IOM
       - disk.write.requests.rate
+      forwarder_iom_data_1_port:
+      - iom_data_1_port
+      - forwarder
       network.incoming.packets_iom_ctrl_fabric_0_port:
       - iom_ctrl_fabric_0_port
       - network.incoming.packets
@@ -532,6 +538,9 @@ topology_template:
       network.outpoing.packets_iom_data_0_port:
       - iom_data_0_port
       - network.outpoing.packets
+      forwarder_iom_mgt_0_port:
+      - iom_mgt_0_port
+      - forwarder
       disk.device.write.bytes.rate_IOM:
       - IOM
       - disk.device.write.bytes.rate
@@ -541,6 +550,9 @@ topology_template:
       network.outgoing.packets.rate_iom_data_1_port:
       - iom_data_1_port
       - network.outgoing.packets.rate
+      forwarder_iom_data_3_port:
+      - iom_data_3_port
+      - forwarder
       disk.device.allocation_IOM:
       - IOM
       - disk.device.allocation
@@ -601,6 +613,9 @@ topology_template:
       disk.device.write.requests.rate_IOM:
       - IOM
       - disk.device.write.requests.rate
+      forwarder_iom_ctrl_fabric_0_port:
+      - iom_ctrl_fabric_0_port
+      - forwarder
       network.incoming.bytes_iom_data_1_port:
       - iom_data_1_port
       - network.incoming.bytes
@@ -640,6 +655,9 @@ topology_template:
       network.outgoing.bytes.rate_iom_data_3_port:
       - iom_data_3_port
       - network.outgoing.bytes.rate
+      forwarder_iom_data_2_port:
+      - iom_data_2_port
+      - forwarder
       memory_IOM:
       - IOM
       - memory
@@ -691,4 +709,4 @@ topology_template:
       - link
       local_storage_IOM:
       - IOM
-      - local_storage
\ No newline at end of file
+      - local_storage