diff options
author | talio <tali.orenbach@amdocs.com> | 2017-11-14 10:18:03 +0200 |
---|---|---|
committer | talio <tali.orenbach@amdocs.com> | 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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity | |
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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity')
8 files changed, 114 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 697e58424d..b521dae6db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -307,6 +307,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_server_1c2_oam_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_oam_server_1c2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -923,6 +928,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_pd_server_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. @@ -941,6 +951,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_server_pd: type: tosca.capabilities.Node occurrences: @@ -1132,6 +1147,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_pd_server_1b_pd_server_1b_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1628,6 +1648,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED link_packet_external_network_0: type: tosca.capabilities.network.Linkable occurrences: @@ -2095,6 +2125,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_1c2_oam_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2581,6 +2616,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2963,6 +3008,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_1c2_oam_2: type: tosca.capabilities.network.Bindable occurrences: @@ -3478,6 +3533,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_1b_ps: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4014,6 +4074,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4621,6 +4686,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_1c1_cmaui_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_cmaui_1c1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4671,4 +4741,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index 684d246bf2..26286c35f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -259,6 +259,9 @@ topology_template: disk.device.write.requests.rate_cmaui_1c1: - cmaui_1c1 - disk.device.write.requests.rate + forwarder_cmaui_1c1_cmaui_port: + - cmaui_1c1_cmaui_port + - forwarder disk.device.write.bytes_cmaui_1c1: - cmaui_1c1 - disk.device.write.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index e04ee542d9..bd75e5b23f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -230,6 +230,9 @@ topology_template: endpoint_oam_server_1c2: - oam_server_1c2 - endpoint + forwarder_oam_server_1c2_oam_port: + - oam_server_1c2_oam_port + - forwarder disk.ephemeral.size_oam_server_1c2: - oam_server_1c2 - disk.ephemeral.size diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index 1dbe52f405..fbb8c1912d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -151,6 +151,9 @@ topology_template: cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta + forwarder_pd_server_1b_pd_server_1b_port: + - pd_server_1b_pd_server_1b_port + - forwarder network.incoming.bytes_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - network.incoming.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index c97cb23644..9f026f4b2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -166,6 +166,9 @@ topology_template: disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity + forwarder_ps_server_1b_ps_server_1b_port: + - ps_server_1b_ps_server_1b_port + - forwarder instance_ps_server_1b: - ps_server_1b - instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml index be3fbadb31..9a62b2021e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml @@ -207,6 +207,12 @@ topology_template: network.outpoing.packets_cmaui_port_01: - cmaui_port_01 - network.outpoing.packets + forwarder_cmaui_port_01: + - cmaui_port_01 + - forwarder + forwarder_cmaui_port_02: + - cmaui_port_02 + - forwarder link_packet_external_network_0: - packet_external_network_0 - link @@ -249,4 +255,4 @@ topology_template: - dependency binding_cmaui_port_02: - cmaui_port_02 - - binding
\ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 828ab0dfbd..ec4283632d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -377,6 +377,9 @@ topology_template: network.outgoing.bytes.rate_pd_server_port_2: - pd_server_port_2 - network.outgoing.bytes.rate + forwarder_pd_server_port_1: + - pd_server_port_1 + - forwarder network.outgoing.bytes.rate_pd_server_port_1: - pd_server_port_1 - network.outgoing.bytes.rate @@ -386,6 +389,9 @@ topology_template: disk.write.bytes.rate_server_pd: - server_pd - disk.write.bytes.rate + forwarder_pd_server_port_2: + - pd_server_port_2 + - forwarder feature_server_pd: - server_pd - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index a3bf3f973a..e26f1c9137 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -457,6 +457,9 @@ topology_template: disk.device.write.requests.rate_server_1c2_oam_1: - abstract_oam_server_1c2_0 - disk.device.write.requests.rate_oam_server_1c2 + forwarder_ps_server_1b_port: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port disk.device.write.requests.rate_server_1c2_oam_2: - abstract_oam_server_1c2_1 - disk.device.write.requests.rate_oam_server_1c2 @@ -706,6 +709,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.bytes.rate_ps_server_1b + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port disk.device.write.requests_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests_ps_server_1b @@ -898,6 +907,12 @@ topology_template: disk.write.bytes.rate_server_1b_pd: - abstract_pd_server_1b - disk.write.bytes.rate_pd_server_1b + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port binding_server_1c2_oam_2: - abstract_oam_server_1c2_1 - binding_oam_server_1c2 @@ -1159,6 +1174,9 @@ topology_template: network.incoming.bytes_oam_port_1: - abstract_oam_server_1c2_0 - network.incoming.bytes_oam_server_1c2_oam_port + forwarder_pd_server_1b_port: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port disk.device.write.requests.rate_server_1b_ps: - abstract_ps_server_1b - disk.device.write.requests.rate_ps_server_1b |