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 | 45 ++++++++++++++++++++++ .../out/Nested_appServiceTemplate.yaml | 9 +++++ .../out/Nested_ioxServiceTemplate.yaml | 9 +++++ .../out/Nested_pltServiceTemplate.yaml | 9 +++++ 4 files changed, 72 insertions(+) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index f48028d381..cc66cebec3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -596,6 +596,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_plt_plt_oam_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_plt_plt_data_0_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -725,6 +730,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_plt_plt_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_plt_plt_data_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -762,6 +772,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_plt_plt_data_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.app: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1160,6 +1175,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_app_app_oam_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1295,6 +1315,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_app_app_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED memory_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1471,6 +1496,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_app_app_data_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1833,6 +1863,11 @@ node_types: - 1 - 1 capabilities: + forwarder_iox_iox_oam_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2228,6 +2263,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_iox_iox_data_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2258,6 +2298,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_iox_iox_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_iox: 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/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 096c214eb4..815fcb5582 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -425,6 +425,9 @@ topology_template: disk.device.latency_app: - app - disk.device.latency + forwarder_app_app_oam_0_port: + - app_app_oam_0_port + - forwarder disk.ephemeral.size_app: - app - disk.ephemeral.size @@ -494,6 +497,9 @@ topology_template: network.outgoing.bytes.rate_app_app_oam_0_port: - app_app_oam_0_port - network.outgoing.bytes.rate + forwarder_app_app_internal_0_port: + - app_app_internal_0_port + - forwarder memory_app: - app - memory @@ -584,6 +590,9 @@ topology_template: network.incoming.bytes_app_app_internal_0_port: - app_app_internal_0_port - network.incoming.bytes + forwarder_app_app_data_0_port: + - app_app_data_0_port + - forwarder disk.write.requests_app: - app - disk.write.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index a157cf8c26..1527056307 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -388,6 +388,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.iox capabilities: + forwarder_iox_iox_oam_0_port: + - iox_iox_oam_0_port + - forwarder cpu.delta_iox: - iox - cpu.delta @@ -589,6 +592,9 @@ topology_template: network.outpoing.packets_iox_iox_oam_0_port: - iox_iox_oam_0_port - network.outpoing.packets + forwarder_iox_iox_data_0_port: + - iox_iox_data_0_port + - forwarder disk.device.read.bytes.rate_iox: - iox - disk.device.read.bytes.rate @@ -604,6 +610,9 @@ topology_template: network.outgoing.bytes.rate_iox_iox_internal_0_port: - iox_iox_internal_0_port - network.outgoing.bytes.rate + forwarder_iox_iox_internal_0_port: + - iox_iox_internal_0_port + - forwarder disk.device.usage_iox: - iox - disk.device.usage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index c1ef9cb284..1365084d4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -526,6 +526,9 @@ topology_template: disk.device.capacity_plt: - plt - disk.device.capacity + forwarder_plt_plt_oam_0_port: + - plt_plt_oam_0_port + - forwarder binding_plt_plt_data_0_port: - plt_plt_data_0_port - binding @@ -592,6 +595,9 @@ topology_template: network.outgoing.bytes.rate_plt_plt_internal_0_port: - plt_plt_internal_0_port - network.outgoing.bytes.rate + forwarder_plt_plt_internal_0_port: + - plt_plt_internal_0_port + - forwarder network.incoming.packets_plt_plt_data_0_port: - plt_plt_data_0_port - network.incoming.packets @@ -610,6 +616,9 @@ topology_template: disk.write.requests.rate_plt: - plt - disk.write.requests.rate + forwarder_plt_plt_data_0_port: + - plt_plt_data_0_port + - forwarder requirements: local_storage_plt: - plt -- cgit 1.2.3-korg