forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

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

3 files changed, 50 insertions, 2 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
index 435c42a81c..6fd0ed7829 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -456,6 +456,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_01:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       instance_server_pcm:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1052,6 +1062,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_00_server_pcm_005:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.write.bytes_server_pcm_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1325,6 +1340,16 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_pcm_port_01_server_pcm_005:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1400,6 +1425,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcm_port_01_server_pcm_005:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
index a1c67fba97..bc34c490e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -395,6 +395,9 @@ topology_template:
       disk.device.read.bytes.rate_server_pcm_1:
       - server_pcm_1
       - disk.device.read.bytes.rate
+      forwarder_pcm_port_00_server_pcm_005:
+      - server_pcm_005
+      - forwarder_pcm_port_00
       disk.write.bytes_server_pcm_server_pcm_005:
       - server_pcm_005
       - disk.write.bytes_server_pcm
@@ -536,6 +539,12 @@ topology_template:
       cpu.delta_server_pcm_1:
       - server_pcm_1
       - cpu.delta
+      forwarder_pcm_port_0:
+      - pcm_port_0
+      - forwarder
+      forwarder_pcm_port_1:
+      - pcm_port_1
+      - forwarder
       network.outpoing.packets_pcm_port_01_server_pcm_005:
       - server_pcm_005
       - network.outpoing.packets_pcm_port_01
@@ -575,6 +584,9 @@ topology_template:
       disk.device.latency_server_pcm_1:
       - server_pcm_1
       - disk.device.latency
+      forwarder_pcm_port_01_server_pcm_005:
+      - server_pcm_005
+      - forwarder_pcm_port_01
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
@@ -662,4 +674,4 @@ topology_template:
       - dependency
       link_pcm_port_01_server_pcm_005:
       - server_pcm_005
-      - link_pcm_port_01
\ No newline at end of file
+      - link_pcm_port_01
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
index 806d12ea62..ca72528fd8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml
@@ -336,6 +336,12 @@ topology_template:
       disk.device.capacity_server_pcm:
       - server_pcm
       - disk.device.capacity
+      forwarder_pcm_port_00:
+      - pcm_port_00
+      - forwarder
+      forwarder_pcm_port_01:
+      - pcm_port_01
+      - forwarder
       instance_server_pcm:
       - server_pcm
       - instance
@@ -384,4 +390,4 @@ topology_template:
       - dependency
       dependency_network_2:
       - network_2
-      - dependency
\ No newline at end of file
+      - dependency