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/nestedServiceTemplate.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/securityrulestoportconnection/securityrulestoportnestedconnection') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index aa5edaeda1..94df836148 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -315,6 +315,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_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. @@ -327,11 +332,21 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_server_cmaui: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_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. @@ -541,4 +556,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/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index ca93e1639f..95d9ed636b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml @@ -274,15 +274,24 @@ topology_template: disk.device.read.bytes_server_cmaui: - server_cmaui - disk.device.read.bytes + forwarder_cmaui_port_0: + - cmaui_port_0 + - forwarder memory_server_cmaui: - server_cmaui - memory disk.root.size_server_cmaui: - server_cmaui - disk.root.size + forwarder_cmaui_port_3: + - cmaui_port_3 + - forwarder binding_server_cmaui: - server_cmaui - binding + forwarder_cmaui_port_1: + - cmaui_port_1 + - forwarder disk.device.read.requests.rate_server_cmaui: - server_cmaui - disk.device.read.requests.rate @@ -412,4 +421,4 @@ topology_template: - dependency link_cmaui_port_3: - cmaui_port_3 - - link \ No newline at end of file + - link -- cgit 1.2.3-korg