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/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
index bcb8046664..62e950b558 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -484,6 +484,11 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      forwarder_oam1_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_oam2_mgmt_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -501,6 +506,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam2_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.write.bytes_oam2_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -737,6 +747,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam2_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.root.size_arb_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -784,6 +799,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_oam1_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_oam2_mgmt_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1335,6 +1355,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_arb_mgmt_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       vcpus_oam2_instance:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1418,6 +1443,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_arb_int_port:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.device.latency_oam2_instance:
         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/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
index 4f1398af5e..c59a175a47 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
@@ -5131,4 +5131,4 @@ topology_template:
           HOT template that creates Security Group and ECA network
       members:
       - mms_security_group
-      - eca_mgmt_net
\ No newline at end of file
+      - eca_mgmt_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
index 663ab05b24..9b69834f06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml
@@ -584,6 +584,9 @@ topology_template:
       binding_arb_mgmt_port:
       - arb_mgmt_port
       - binding
+      forwarder_oam1_mgmt_port:
+      - oam1_mgmt_port
+      - forwarder
       network.outpoing.packets_oam2_mgmt_port:
       - oam2_mgmt_port
       - network.outpoing.packets
@@ -593,6 +596,9 @@ topology_template:
       attachment_arb_int_port:
       - arb_int_port
       - attachment
+      forwarder_oam2_int_port:
+      - oam2_int_port
+      - forwarder
       disk.device.write.bytes_oam2_instance:
       - oam2_instance
       - disk.device.write.bytes
@@ -713,6 +719,9 @@ topology_template:
       scalable_oam1_instance:
       - oam1_instance
       - scalable
+      forwarder_oam2_mgmt_port:
+      - oam2_mgmt_port
+      - forwarder
       disk.root.size_arb_instance:
       - arb_instance
       - disk.root.size
@@ -737,6 +746,9 @@ topology_template:
       disk.device.read.bytes.rate_oam2_instance:
       - oam2_instance
       - disk.device.read.bytes.rate
+      forwarder_oam1_int_port:
+      - oam1_int_port
+      - forwarder
       network.outgoing.packets.rate_oam2_mgmt_port:
       - oam2_mgmt_port
       - network.outgoing.packets.rate
@@ -1016,6 +1028,9 @@ topology_template:
       disk.device.write.requests.rate_arb_instance:
       - arb_instance
       - disk.device.write.requests.rate
+      forwarder_arb_mgmt_port:
+      - arb_mgmt_port
+      - forwarder
       vcpus_oam2_instance:
       - oam2_instance
       - vcpus
@@ -1061,6 +1076,9 @@ topology_template:
       attachment_oam2_int_port:
       - oam2_int_port
       - attachment
+      forwarder_arb_int_port:
+      - arb_int_port
+      - forwarder
       disk.device.latency_oam2_instance:
       - oam2_instance
       - disk.device.latency
@@ -1151,4 +1169,4 @@ topology_template:
       - local_storage
       dependency_arb_int_port:
       - arb_int_port
-      - dependency
\ No newline at end of file
+      - dependency