From 94802b9b83a0a9edea77cbff76639aaefeca8d8e Mon Sep 17 00:00:00 2001 From: talio Date: Tue, 14 Nov 2017 10:18:03 +0200 Subject: forwarder test fix fix translator tests with forwarder capability Issue-Id : SDC-653 Change-Id: I59db23acb0e2c3b5920bf24662374fee950d479b Signed-off-by: talio --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 17 ++++++++++++++++- .../expectedoutputfiles/nested1ServiceTemplate.yaml | 11 ++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d7dac6ebc8..a8416b7f21 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -209,6 +209,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_abc_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu_util_server_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -599,6 +604,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui: type: tosca.capabilities.network.Bindable occurrences: @@ -610,6 +620,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_abc: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -816,4 +831,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/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml index 15e635979b..2256009421 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -234,6 +234,9 @@ topology_template: host_server_cmaui: - server_cmaui - host + forwarder_abc_port_1: + - abc_port_1 + - forwarder cpu_util_server_cmaui: - server_cmaui - cpu_util @@ -432,12 +435,18 @@ topology_template: disk.device.read.bytes_server_abc: - server_abc - disk.device.read.bytes + forwarder_cmaui_port_2: + - cmaui_port_2 + - forwarder binding_server_cmaui: - server_cmaui - binding memory.usage_server_abc: - server_abc - memory.usage + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder disk.read.requests_server_abc: - server_abc - disk.read.requests @@ -573,4 +582,4 @@ topology_template: - dependency local_storage_server_abc: - server_abc - - local_storage \ No newline at end of file + - local_storage -- cgit 1.2.3-korg