diff options
author | 2017-11-14 10:18:03 +0200 | |
---|---|---|
committer | 2017-11-14 10:19:34 +0200 | |
commit | 94802b9b83a0a9edea77cbff76639aaefeca8d8e (patch) | |
tree | 33e4a62c13abfaa8e0d4bf18a1639741abe8b31f /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out | |
parent | d1746c4f5fe77754a57c77f55d657a352972a06e (diff) |
forwarder test fix
fix translator tests with forwarder capability
Issue-Id : SDC-653
Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out')
10 files changed, 162 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 49ac20889a..83341fab08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -751,6 +751,26 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + 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 disk.capacity_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1301,12 +1321,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: 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_pcma_server_pcm_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2006,6 +2036,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. @@ -2442,6 +2482,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2478,6 +2523,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c2_catalog_instance_1c2_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_1c2_catalog_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2965,6 +3015,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcma_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_pcma_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pcma_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3341,6 +3401,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -3369,6 +3434,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -3973,6 +4043,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4020,6 +4095,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_1c1_scalling_instance_1c1_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_1c1_scalling_instance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4526,6 +4606,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4614,6 +4699,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_a_single_1a_1a_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_a_single_1a: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5009,6 +5099,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED endpoint_b_single_1b: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -5037,6 +5132,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_b_single_1b_1b_t1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_b_single_1b: type: tosca.capabilities.Scalable occurrences: @@ -5375,4 +5475,4 @@ node_types: type: tosca.capabilities.Node 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/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 9e94593103..045f907605 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -271,6 +271,9 @@ topology_template: cpu_1c1_scalling_instance: - 1c1_scalling_instance - cpu + forwarder_1c1_scalling_instance_1c1_t2_port: + - 1c1_scalling_instance_1c1_t2_port + - forwarder disk.write.bytes_1c1_scalling_instance: - 1c1_scalling_instance - disk.write.bytes @@ -295,6 +298,9 @@ topology_template: disk.device.write.requests.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.device.write.requests.rate + forwarder_1c1_scalling_instance_1c1_t1_port: + - 1c1_scalling_instance_1c1_t1_port + - forwarder disk.read.bytes.rate_1c1_scalling_instance: - 1c1_scalling_instance - disk.read.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index f686203df4..e761770921 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -314,6 +314,9 @@ topology_template: attachment_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - attachment + forwarder_1c2_catalog_instance_1c2_t1_port: + - 1c2_catalog_instance_1c2_t1_port + - forwarder network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port: - 1c2_catalog_instance_1c2_t1_port - network.outgoing.packets.rate @@ -332,6 +335,9 @@ topology_template: disk.device.read.bytes.rate_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.read.bytes.rate + forwarder_1c2_catalog_instance_1c2_t2_port: + - 1c2_catalog_instance_1c2_t2_port + - forwarder disk.device.allocation_1c2_catalog_instance: - 1c2_catalog_instance - disk.device.allocation diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index 9aa2e2d8e4..c175da1795 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -242,6 +242,9 @@ topology_template: cpu.delta_a_single_1a: - a_single_1a - cpu.delta + forwarder_a_single_1a_1a_t1_port: + - a_single_1a_1a_t1_port + - forwarder disk.device.write.requests_a_single_1a: - a_single_1a - disk.device.write.requests @@ -287,6 +290,9 @@ topology_template: memory.usage_a_single_1a: - a_single_1a - memory.usage + forwarder_a_single_1a_1a_t2_port: + - a_single_1a_1a_t2_port + - forwarder disk.device.write.requests.rate_a_single_1a: - a_single_1a - disk.device.write.requests.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml index cf69da5d8f..dd68f12949 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml @@ -204,6 +204,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -219,6 +222,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 9d6e5d9099..60dd00b7a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -209,6 +209,9 @@ topology_template: attachment_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - attachment + forwarder_b_single_1b_1b_t2_port: + - b_single_1b_1b_t2_port + - forwarder endpoint_b_single_1b: - b_single_1b - endpoint @@ -224,6 +227,9 @@ topology_template: network.outgoing.bytes.rate_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - network.outgoing.bytes.rate + forwarder_b_single_1b_1b_t1_port: + - b_single_1b_1b_t1_port + - forwarder scalable_b_single_1b: - b_single_1b - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index 41bef51803..87432d3911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -327,9 +327,15 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_2: - pcma_server_pcm_port_2 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_2: + - pcma_server_pcm_port_2 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests + forwarder_pcma_server_pcm_port_3: + - pcma_server_pcm_port_3 + - forwarder disk.write.bytes.rate_pcma_server: - pcma_server - disk.write.bytes.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml index 0079f2a476..4f927ee3a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -312,6 +312,12 @@ topology_template: network.incoming.packets.rate_pcma_server_pcm_port_1: - pcma_server_pcm_port_1 - network.incoming.packets.rate + forwarder_pcma_server_pcm_port_0: + - pcma_server_pcm_port_0 + - forwarder + forwarder_pcma_server_pcm_port_1: + - pcma_server_pcm_port_1 + - forwarder disk.device.read.requests_pcma_server: - pcma_server - disk.device.read.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 676798e9a3..b60c6d29e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -533,6 +533,18 @@ topology_template: os_server_pcma2: - abstract_pcma_server - os_pcma_server + forwarder_pcm_port_2: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_2 + forwarder_pcm_port_3: + - abstract_pcma_server + - forwarder_pcma_server_pcm_port_3 + forwarder_pcm_port_0: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_0 + forwarder_pcm_port_1: + - abstract_pcma_server_1 + - forwarder_pcma_server_pcm_port_1 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index 293a19f311..a99b0d53d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -410,6 +410,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 @@ -452,4 +458,4 @@ topology_template: - link dependency_server_pcm: - server_pcm - - dependency
\ No newline at end of file + - dependency |