forwarder test fix

fix translator tests with forwarder capability

Issue-Id : SDC-653

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

6 files changed, 117 insertions, 5 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0e28138a0d..acb2ecf5ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -366,6 +366,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_pps_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outpoing.packets_pcrf_pps_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -888,12 +893,27 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_7:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_pcrf_ppd_port_7:
         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_pcrf_ppd_port_6:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_5:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_pcrf_ppd_port_5:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -911,17 +931,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_4:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_3:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
+      forwarder_pcrf_ppd_port_2:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       os_pcrf_server_ppd:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_ppd_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       disk.capacity_pcrf_server_ppd:
         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_pcrf_ppd_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       endpoint_pcrf_server_ppd:
         type: tosca.capabilities.Endpoint.Admin
         occurrences:
@@ -1882,12 +1927,22 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_pcm_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       cpu_pcrf_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.
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_pcm_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.incoming.bytes.rate_pcrf_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2393,6 +2448,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_oam_port_1:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes_pcrf_oam_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2428,6 +2488,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_pcrf_oam_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested-psm_v1.0:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -2535,6 +2600,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      forwarder_psm01_port_0:
+        type: org.openecomp.capabilities.Forwarder
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.bytes.rate_psm01_port_0:
         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/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
index d2c15dd6ca..dd402da1fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml
@@ -359,6 +359,9 @@ topology_template:
       memory.usage_pcrf_server_oam:
       - pcrf_server_oam
       - memory.usage
+      forwarder_pcrf_oam_port_1:
+      - pcrf_oam_port_1
+      - forwarder
       network.outgoing.bytes_pcrf_oam_port_0:
       - pcrf_oam_port_0
       - network.outgoing.bytes
@@ -377,6 +380,9 @@ topology_template:
       network.outpoing.packets_pcrf_oam_port_1:
       - pcrf_oam_port_1
       - network.outpoing.packets
+      forwarder_pcrf_oam_port_0:
+      - pcrf_oam_port_0
+      - forwarder
     requirements:
       dependency_pcrf_server_oam:
       - pcrf_server_oam
@@ -395,4 +401,4 @@ topology_template:
       - dependency
       dependency_pcrf_oam_port_0:
       - pcrf_oam_port_0
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
index 71550c19cd..53e049a6f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml
@@ -344,9 +344,15 @@ topology_template:
       network.incoming.bytes.rate_pcrf_pcm_port_1:
       - pcrf_pcm_port_1
       - network.incoming.bytes.rate
+      forwarder_pcrf_pcm_port_0:
+      - pcrf_pcm_port_0
+      - forwarder
       cpu_pcrf_server_pcm:
       - pcrf_server_pcm
       - cpu
+      forwarder_pcrf_pcm_port_1:
+      - pcrf_pcm_port_1
+      - forwarder
       network.incoming.bytes.rate_pcrf_pcm_port_0:
       - pcrf_pcm_port_0
       - network.incoming.bytes.rate
@@ -386,4 +392,4 @@ topology_template:
       - link
       link_pcrf_pcm_port_1:
       - pcrf_pcm_port_1
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
index fb5ab01933..a1591c5a42 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml
@@ -553,9 +553,18 @@ topology_template:
       memory.resident_pcrf_server_ppd:
       - pcrf_server_ppd
       - memory.resident
+      forwarder_pcrf_ppd_port_7:
+      - pcrf_ppd_port_7
+      - forwarder
       network.outgoing.bytes.rate_pcrf_ppd_port_7:
       - pcrf_ppd_port_7
       - network.outgoing.bytes.rate
+      forwarder_pcrf_ppd_port_6:
+      - pcrf_ppd_port_6
+      - forwarder
+      forwarder_pcrf_ppd_port_5:
+      - pcrf_ppd_port_5
+      - forwarder
       network.outgoing.bytes.rate_pcrf_ppd_port_5:
       - pcrf_ppd_port_5
       - network.outgoing.bytes.rate
@@ -565,12 +574,27 @@ topology_template:
       network.outgoing.bytes.rate_pcrf_ppd_port_6:
       - pcrf_ppd_port_6
       - network.outgoing.bytes.rate
+      forwarder_pcrf_ppd_port_4:
+      - pcrf_ppd_port_4
+      - forwarder
+      forwarder_pcrf_ppd_port_3:
+      - pcrf_ppd_port_3
+      - forwarder
+      forwarder_pcrf_ppd_port_2:
+      - pcrf_ppd_port_2
+      - forwarder
       os_pcrf_server_ppd:
       - pcrf_server_ppd
       - os
+      forwarder_pcrf_ppd_port_1:
+      - pcrf_ppd_port_1
+      - forwarder
       disk.capacity_pcrf_server_ppd:
       - pcrf_server_ppd
       - disk.capacity
+      forwarder_pcrf_ppd_port_0:
+      - pcrf_ppd_port_0
+      - forwarder
       endpoint_pcrf_server_ppd:
       - pcrf_server_ppd
       - endpoint
@@ -892,4 +916,4 @@ topology_template:
       - dependency
       local_storage_pcrf_server_ppd:
       - pcrf_server_ppd
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
index 7b3334c368..3d7777ac8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml
@@ -263,6 +263,9 @@ topology_template:
       memory_pcrf_server_pps:
       - pcrf_server_pps
       - memory
+      forwarder_pcrf_pps_port_0:
+      - pcrf_pps_port_0
+      - forwarder
       network.outpoing.packets_pcrf_pps_port_0:
       - pcrf_pps_port_0
       - network.outpoing.packets
@@ -287,4 +290,4 @@ topology_template:
       - dependency
       local_storage_pcrf_server_pps:
       - pcrf_server_pps
-      - 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/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
index 08e9ecc28e..a4ec4f30be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml
@@ -134,6 +134,9 @@ topology_template:
       disk.device.write.bytes.rate_pcrf_server_psm:
       - pcrf_server_psm
       - disk.device.write.bytes.rate
+      forwarder_psm01_port_0:
+      - psm01_port_0
+      - forwarder
       network.outgoing.bytes.rate_psm01_port_0:
       - psm01_port_0
       - network.outgoing.bytes.rate
@@ -287,4 +290,4 @@ topology_template:
       - dependency
       link_psm01_port_0:
       - psm01_port_0
-      - link
\ No newline at end of file
+      - link