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/nestedSingleCompute | |
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/nestedSingleCompute')
58 files changed, 2000 insertions, 1098 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9ff008ea80..f5b23edb40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -427,6 +427,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_12: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_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. @@ -511,6 +516,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_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. @@ -976,6 +986,16 @@ node_types: 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.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1417,4 +1437,4 @@ node_types: type: tosca.capabilities.network.Bindable 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/nestedSingleCompute/diffNestedFilesWithSameComputeType/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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index e0431278ab..284d7d06f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -352,6 +352,12 @@ topology_template: disk.device.capacity_server_pcm_1: - server_pcm_1 - disk.device.capacity + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.requests_server_pcm_1: - server_pcm_1 - disk.read.requests @@ -445,4 +451,4 @@ topology_template: - dependency local_storage_server_pcm_1: - server_pcm_1 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index f6d3eae817..c1975a9d23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -358,6 +358,9 @@ topology_template: disk.read.bytes.rate_server_pcm: - server_pcm - disk.read.bytes.rate + forwarder_pcm_port_12: + - pcm_port_12 + - forwarder disk.device.allocation_server_pcm: - server_pcm - disk.device.allocation @@ -400,6 +403,9 @@ topology_template: binding_server_pcm: - server_pcm - binding + forwarder_pcm_port_02: + - pcm_port_02 + - forwarder disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity @@ -445,4 +451,4 @@ topology_template: - dependency link_pcm_port_02: - pcm_port_02 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 08a713b83a..07a842e260 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -245,6 +245,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_cdi_cdi_internal_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. @@ -466,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_cdi: type: tosca.capabilities.Scalable occurrences: @@ -1093,6 +1103,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_dpdk_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1122,6 +1137,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1158,6 +1178,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_lbd_lbd_dpdk_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1616,6 +1641,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1934,6 +1964,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2333,6 +2368,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_oam_oam_internal_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2369,6 +2409,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_oam_oam_internal_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2869,6 +2914,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3012,6 +3062,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3460,6 +3515,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cdi_cdi_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3662,6 +3722,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_cdi: type: tosca.capabilities.Scalable occurrences: @@ -4374,6 +4439,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_lbd_lbd_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_lbd_lbd_internal_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. @@ -4473,12 +4543,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_lbd: 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_lbd_lbd_dpdk_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_lbd: type: tosca.capabilities.Node occurrences: @@ -5000,35 +5080,18 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_cif: - 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 disk.device.read.requests_cif: 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 - disk.device.write.bytes_cif: - 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 disk.latency_cif: 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 - feature_cif_cif_ims_li_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED os_cif: type: tosca.capabilities.OperatingSystem occurrences: @@ -5062,500 +5125,542 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_1_port_3: + instance_cif: 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 - instance_cif: + network.incoming.bytes.rate_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes_cif_cif_ims_li_1_port: 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 - network.outgoing.bytes_cif_cif_oam_1_port_3: + network.incoming.packets.rate_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_li_1_port: + feature_cif_cif_oam_1_port_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_cif: 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 - network.outgoing.bytes_cif_cif_oam_1_port_1: + feature_cif_cif_oam_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_cif: 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 - disk.allocation_cif: + network.outgoing.bytes_cif_cif_ims_core_1_port: 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 - network.outgoing.bytes.rate_cif_cif_internal_1_port: + network.incoming.packets.rate_cif_cif_oam_1_port_3: 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 - network.incoming.packets.rate_cif_cif_oam_1_port_1: + network.incoming.bytes_cif_cif_ims_li_1_port: 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 - disk.device.iops_cif: + network.incoming.bytes_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_1_port_3: - type: tosca.capabilities.Node + disk.usage_cif: + 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 - disk.root.size_cif: + disk.ephemeral.size_cif: 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 - disk.device.write.requests_cif: + disk.write.requests.rate_cif: 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 - feature_cif_cif_oam_1_port_1: - type: tosca.capabilities.Node + disk.read.bytes_cif: + 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 - memory.resident_cif: + network.incoming.packets.rate_cif_cif_ims_core_1_port: 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 - network.incoming.bytes.rate_cif_cif_internal_1_port: + network.outgoing.packets.rate_cif_cif_internal_1_port: 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 - binding_cif_cif_ims_core_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.read.requests.rate_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_1_port: + disk.device.allocation_cif: 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 - attachment_cif_cif_ims_core_1_port: - type: tosca.capabilities.Attachment + disk.device.read.bytes.rate_cif: + 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 - network.incoming.packets.rate_cif_cif_oam_1_port_3: + vcpus_cif: 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 - network.incoming.bytes_cif_cif_ims_li_1_port: + network.outgoing.packets.rate_cif_cif_ims_li_1_port: 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 - network.incoming.bytes_cif_cif_oam_1_port_1: + network.incoming.bytes.rate_cif_cif_ims_li_1_port: 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 - attachment_cif_cif_oam_1_port_3: - type: tosca.capabilities.Attachment + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.usage_cif: + network.incoming.packets.rate_cif_cif_ims_li_1_port: 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 - disk.write.bytes.rate_cif: + disk.device.usage_cif: 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 - network.incoming.bytes_cif_cif_ims_core_1_port: + network.outpoing.packets_cif_cif_ims_core_1_port: 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 - host_cif: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + attachment_cif_cif_oam_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cif: + network.outgoing.packets.rate_cif_cif_oam_1_port_3: 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 - disk.write.requests.rate_cif: + network.incoming.bytes_cif_cif_oam_1_port_3: 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 - cpu.delta_cif: + network.outgoing.packets.rate_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_cif: + disk.read.requests_cif: 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 - network.incoming.packets.rate_cif_cif_ims_core_1_port: + disk.write.bytes_cif: 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 - network.outgoing.packets.rate_cif_cif_internal_1_port: + network.outpoing.packets_cif_cif_ims_li_1_port: 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 - scalable_cif: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_cif_cif_ims_li_1_port: + 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 - disk.device.read.requests.rate_cif: + network.outpoing.packets_cif_cif_oam_1_port_3: 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 - binding_cif_cif_oam_1_port_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - feature_cif_cif_internal_1_port: - type: tosca.capabilities.Node + disk.device.capacity_cif: + 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 - binding_cif_cif_oam_1_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.device.allocation_cif: + network.outpoing.packets_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cif: + network.incoming.packets.rate_cif_cif_internal_1_port: 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 - vcpus_cif: + cpu_cif: 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 - disk.device.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_internal_1_port: 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 - network.outgoing.packets.rate_cif_cif_ims_li_1_port: + network.outgoing.bytes_cif_cif_internal_1_port: 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 - network.incoming.bytes.rate_cif_cif_ims_li_1_port: + disk.device.read.bytes_cif: 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 - endpoint_cif: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.bytes.rate_cif_cif_ims_core_1_port: + 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 - network.incoming.packets.rate_cif_cif_ims_li_1_port: + network.incoming.packets_cif_cif_ims_core_1_port: 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 - disk.device.usage_cif: + network.outpoing.packets_cif_cif_internal_1_port: 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 - disk.iops_cif: + feature_cif: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_1_port: 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 - disk.read.bytes.rate_cif: + cpu_util_cif: 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 - network.outpoing.packets_cif_cif_ims_core_1_port: + disk.device.write.bytes_cif: 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 - attachment_cif_cif_oam_1_port_1: - type: tosca.capabilities.Attachment + feature_cif_cif_ims_li_1_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_1_port_3: + network.incoming.packets_cif_cif_oam_1_port_3: 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 - network.incoming.bytes_cif_cif_oam_1_port_3: + network.outgoing.bytes_cif_cif_oam_1_port_3: 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 - network.outgoing.packets.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_cif: + disk.allocation_cif: 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 - binding_cif_cif_ims_li_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory_cif: + network.outgoing.bytes.rate_cif_cif_internal_1_port: 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 - disk.read.requests_cif: + disk.device.iops_cif: 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 - network.outgoing.packets.rate_cif_cif_ims_core_1_port: + disk.device.write.requests_cif: 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 - network.outgoing.bytes.rate_cif_cif_oam_1_port_1: + network.incoming.bytes.rate_cif_cif_internal_1_port: 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 - disk.write.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cif_cif_ims_core_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_cif_cif_ims_core_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_oam_1_port_3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.capacity_cif: + disk.write.bytes.rate_cif: 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 - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + network.incoming.bytes_cif_cif_ims_core_1_port: 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 - network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_cif: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_1_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_oam_1_port_3: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.capacity_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_oam_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_1_port_1: + cpu.delta_cif: 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 - network.incoming.packets.rate_cif_cif_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_cif: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - binding_cif_cif_internal_1_port: + binding_cif_cif_oam_1_port_3: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.incoming.packets_cif_cif_oam_1_port_1: + feature_cif_cif_internal_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_oam_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes.rate_cif: 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 - cpu_cif: + disk.iops_cif: 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 - network.incoming.bytes_cif_cif_internal_1_port: + disk.read.bytes.rate_cif: 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 - network.outgoing.bytes_cif_cif_internal_1_port: + forwarder_cif_cif_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_cif: 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 - disk.device.read.bytes_cif: + binding_cif_cif_ims_li_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + memory_cif: 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 - disk.device.latency_cif: + network.outgoing.packets.rate_cif_cif_ims_core_1_port: 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 - network.outgoing.bytes.rate_cif_cif_ims_core_1_port: + network.outgoing.bytes.rate_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_1_port: + disk.capacity_cif: 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 - disk.device.write.requests.rate_cif: + network.outgoing.bytes.rate_cif_cif_oam_1_port_3: 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 - network.outpoing.packets_cif_cif_internal_1_port: + binding_cif_cif_internal_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets_cif_cif_oam_1_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. occurrences: - 1 - UNBOUNDED - feature_cif: - type: tosca.capabilities.Node + forwarder_cif_cif_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_cif_cif_internal_1_port: - type: tosca.capabilities.Attachment + disk.device.latency_cif: + 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 - network.incoming.bytes.rate_cif_cif_ims_core_1_port: + forwarder_cif_cif_ims_li_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_cif: 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 + attachment_cif_cif_internal_1_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5943,6 +6048,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cscf_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_cscf_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6364,6 +6474,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_oam_oam_internal_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. @@ -6622,6 +6737,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_oam_oam_oam_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. @@ -6988,6 +7108,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7131,6 +7256,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7774,518 +7904,561 @@ node_types: - 1 - 1 capabilities: - network.incoming.bytes.rate_cif_cif_internal_0_port: + binding_cif: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_cif: 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 - binding_cif_cif_oam_0_port_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.latency_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cif: - type: tosca.capabilities.network.Bindable + os_cif: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - cpu_util_cif: + memory.usage_cif: 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 - disk.device.read.requests_cif: + attachment_cif_cif_internal_0_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cif_cif_oam_0_port_3: 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 - disk.device.write.bytes_cif: + network.incoming.packets.rate_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_internal_0_port: + network.incoming.bytes.rate_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - disk.latency_cif: + network.outgoing.packets.rate_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - os_cif: - type: tosca.capabilities.OperatingSystem + network.outgoing.bytes.rate_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - memory.usage_cif: + instance_cif: 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 - attachment_cif_cif_internal_0_port: - type: tosca.capabilities.Attachment + forwarder_cif_cif_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_0_port_3: + network.incoming.bytes_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_core_0_port: + network.outgoing.bytes.rate_cif_cif_oam_0_port_3: 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 - network.incoming.bytes.rate_cif_cif_oam_0_port_1: + network.outpoing.packets_cif_cif_oam_0_port_3: 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 - feature_cif_cif_internal_0_port: - type: tosca.capabilities.Node + network.outpoing.packets_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_internal_0_port: + network.incoming.packets.rate_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_0_port_1: + network.incoming.bytes.rate_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_0_port_3: + disk.root.size_cif: 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 - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: + memory.resident_cif: 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 - instance_cif: + network.incoming.packets_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_li_0_port: - type: tosca.capabilities.Node + network.incoming.packets_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_oam_0_port_3: + disk.usage_cif: 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 - network.incoming.bytes_cif_cif_ims_li_0_port: + disk.ephemeral.size_cif: 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 - network.outgoing.bytes_cif_cif_oam_0_port_1: + network.outgoing.bytes_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_core_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_0_port_3: + disk.write.requests.rate_cif: 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 - disk.allocation_cif: + disk.read.bytes_cif: 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 - network.outpoing.packets_cif_cif_oam_0_port_3: + disk.device.read.requests.rate_cif: 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 - network.outpoing.packets_cif_cif_oam_0_port_1: + network.incoming.bytes_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - disk.device.iops_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_ims_li_0_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_li_0_port: + network.outgoing.packets.rate_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_li_0_port: + disk.device.allocation_cif: 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 - disk.root.size_cif: + binding_cif_cif_internal_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.packets.rate_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cif: + disk.device.read.bytes.rate_cif: 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 - memory.resident_cif: + vcpus_cif: 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 - network.outpoing.packets_cif_cif_internal_0_port: + network.incoming.packets.rate_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_li_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. + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_0_port: + disk.device.usage_cif: 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 - network.outgoing.packets.rate_cif_cif_oam_0_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_ims_li_0_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.usage_cif: + network.outgoing.packets.rate_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - host_cif: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes_cif_cif_oam_0_port_3: + 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 - disk.ephemeral.size_cif: + network.outpoing.packets_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_li_0_port: + disk.read.requests_cif: 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 - disk.write.requests.rate_cif: + disk.write.bytes_cif: 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 - cpu.delta_cif: + network.outgoing.bytes_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_cif: + disk.device.capacity_cif: 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 - scalable_cif: - type: tosca.capabilities.Scalable + feature_cif_cif_oam_0_port_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_cif: + network.incoming.bytes_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_0_port: + feature_cif_cif_oam_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cif_cif_oam_0_port_3: 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 - attachment_cif_cif_ims_li_0_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_li_0_port: + cpu_cif: 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 - disk.device.allocation_cif: + disk.device.read.bytes_cif: 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 - binding_cif_cif_internal_0_port: + forwarder_cif_cif_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cif_cif_oam_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cif_cif_oam_0_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_cif: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_oam_0_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_core_0_port: + network.incoming.bytes.rate_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_li_0_port: + binding_cif_cif_oam_0_port_3: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - disk.device.read.bytes.rate_cif: + cpu_util_cif: 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 - vcpus_cif: + disk.device.write.bytes_cif: 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 - network.incoming.packets.rate_cif_cif_internal_0_port: + network.outgoing.bytes_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_internal_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_cif: - type: tosca.capabilities.Endpoint.Admin + network.incoming.packets_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - disk.device.usage_cif: + network.incoming.packets_cif_cif_oam_0_port_3: 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 - disk.iops_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_ims_li_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cif: + network.outgoing.bytes_cif_cif_oam_0_port_3: 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 - network.outgoing.packets.rate_cif_cif_oam_0_port_1: + network.outgoing.bytes_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_oam_0_port_1: + binding_cif_cif_ims_core_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.allocation_cif: 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 - network.incoming.bytes.rate_cif_cif_ims_core_0_port: + disk.device.iops_cif: 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 - network.incoming.bytes_cif_cif_oam_0_port_3: + disk.device.write.requests_cif: 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 - network.outpoing.packets_cif_cif_ims_core_0_port: + network.outpoing.packets_cif_cif_internal_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_cif: + network.outgoing.packets.rate_cif_cif_oam_0_port_3: 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 - memory_cif: + disk.write.bytes.rate_cif: 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 - attachment_cif_cif_ims_core_0_port: - type: tosca.capabilities.Attachment + host_cif: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: + cpu.delta_cif: 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 - disk.read.requests_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_cif: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.write.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cif_cif_ims_li_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.capacity_cif: + disk.device.write.bytes.rate_cif: 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 - network.outgoing.bytes_cif_cif_ims_core_0_port: + disk.iops_cif: 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 - network.outgoing.bytes.rate_cif_cif_oam_0_port_1: + disk.read.bytes.rate_cif: 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 - network.outpoing.packets_cif_cif_ims_li_0_port: + network.incoming.bytes.rate_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - disk.device.capacity_cif: + disk.write.requests_cif: 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 - feature_cif_cif_ims_core_0_port: - type: tosca.capabilities.Node + memory_cif: + 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 - feature_cif_cif_oam_0_port_3: - type: tosca.capabilities.Node + attachment_cif_cif_ims_core_0_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_core_0_port: + network.outgoing.bytes.rate_cif_cif_ims_core_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. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_0_port_1: - type: tosca.capabilities.Node + disk.capacity_cif: + 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 - network.incoming.packets.rate_cif_cif_oam_0_port_3: + network.outgoing.bytes.rate_cif_cif_oam_0_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_oam_0_port_1: + network.outpoing.packets_cif_cif_ims_li_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. occurrences: - 1 - UNBOUNDED - cpu_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_ims_core_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8299,12 +8472,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cif: - 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 disk.device.latency_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8329,18 +8496,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cif: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_cif_cif_oam_0_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.cscf: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -8707,6 +8862,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cscf_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_cscf_server_0: 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/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index 1f222c16d4..fc9676cc7a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -281,6 +281,9 @@ topology_template: network.incoming.bytes.rate_cdi_cdi_internal_0_port: - cdi_cdi_internal_0_port - network.incoming.bytes.rate + forwarder_cdi_cdi_ims_core_0_port: + - cdi_cdi_ims_core_0_port + - forwarder network.outgoing.bytes_cdi_cdi_internal_0_port: - cdi_cdi_internal_0_port - network.outgoing.bytes @@ -392,6 +395,9 @@ topology_template: disk.allocation_cdi: - cdi - disk.allocation + forwarder_cdi_cdi_internal_0_port: + - cdi_cdi_internal_0_port + - forwarder scalable_cdi: - cdi - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index 2e6c581f05..b543f90372 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -296,6 +296,9 @@ topology_template: disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate + forwarder_cdi_cdi_ims_core_1_port: + - cdi_cdi_ims_core_1_port + - forwarder network.incoming.bytes_cdi_cdi_ims_core_1_port: - cdi_cdi_ims_core_1_port - network.incoming.bytes @@ -398,6 +401,9 @@ topology_template: network.outpoing.packets_cdi_cdi_ims_core_1_port: - cdi_cdi_ims_core_1_port - network.outpoing.packets + forwarder_cdi_cdi_internal_1_port: + - cdi_cdi_internal_1_port + - forwarder scalable_cdi: - cdi - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index 23bb1c8257..3c3da4e997 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -554,27 +554,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cif capabilities: - network.incoming.bytes.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.bytes.rate - binding_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - binding binding_cif: - cif - binding - cpu_util_cif: - - cif - - cpu_util disk.device.read.requests_cif: - cif - disk.device.read.requests - disk.device.write.bytes_cif: - - cif - - disk.device.write.bytes - network.outgoing.bytes_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.bytes disk.latency_cif: - cif - disk.latency @@ -596,54 +581,30 @@ topology_template: network.incoming.bytes.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes.rate - feature_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - feature network.outgoing.packets.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.outgoing.packets.rate - network.incoming.packets_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.incoming.packets - network.incoming.packets_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.incoming.packets network.outgoing.bytes.rate_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.outgoing.bytes.rate instance_cif: - cif - instance - feature_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - feature - network.outgoing.bytes_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.outgoing.bytes + forwarder_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - forwarder network.incoming.bytes_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.bytes - network.outgoing.bytes_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.outgoing.bytes - binding_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - binding network.outgoing.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.bytes.rate - disk.allocation_cif: - - cif - - disk.allocation network.outpoing.packets_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outpoing.packets network.outpoing.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outpoing.packets - disk.device.iops_cif: - - cif - - disk.device.iops network.incoming.packets.rate_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.packets.rate @@ -653,33 +614,18 @@ topology_template: disk.root.size_cif: - cif - disk.root.size - disk.device.write.requests_cif: - - cif - - disk.device.write.requests memory.resident_cif: - cif - memory.resident - network.outpoing.packets_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outpoing.packets network.incoming.packets_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.packets network.incoming.packets_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.incoming.packets - network.outgoing.packets.rate_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.outgoing.packets.rate disk.usage_cif: - cif - disk.usage - disk.write.bytes.rate_cif: - - cif - - disk.write.bytes.rate - host_cif: - - cif - - host disk.ephemeral.size_cif: - cif - disk.ephemeral.size @@ -689,15 +635,9 @@ topology_template: disk.write.requests.rate_cif: - cif - disk.write.requests.rate - cpu.delta_cif: - - cif - - cpu.delta disk.read.bytes_cif: - cif - disk.read.bytes - scalable_cif: - - cif - - scalable disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate @@ -719,9 +659,6 @@ topology_template: network.outgoing.packets.rate_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outgoing.packets.rate - binding_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - binding disk.device.read.bytes.rate_cif: - cif - disk.device.read.bytes.rate @@ -731,72 +668,39 @@ topology_template: network.incoming.packets.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.incoming.packets.rate - disk.device.write.bytes.rate_cif: - - cif - - disk.device.write.bytes.rate endpoint_cif: - cif - endpoint disk.device.usage_cif: - cif - disk.device.usage - disk.iops_cif: - - cif - - disk.iops - disk.read.bytes.rate_cif: - - cif - - disk.read.bytes.rate + forwarder_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - forwarder network.outgoing.packets.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outgoing.packets.rate network.incoming.bytes_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes - network.incoming.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.bytes.rate network.incoming.bytes_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.bytes network.outpoing.packets_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outpoing.packets - disk.write.requests_cif: - - cif - - disk.write.requests - memory_cif: - - cif - - memory - attachment_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - attachment - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.bytes.rate disk.read.requests_cif: - cif - disk.read.requests disk.write.bytes_cif: - cif - disk.write.bytes - disk.capacity_cif: - - cif - - disk.capacity network.outgoing.bytes_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outgoing.bytes - network.outgoing.bytes.rate_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.outgoing.bytes.rate - network.outpoing.packets_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outpoing.packets disk.device.capacity_cif: - cif - disk.device.capacity - feature_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - feature feature_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - feature @@ -815,15 +719,132 @@ topology_template: cpu_cif: - cif - cpu + disk.device.read.bytes_cif: + - cif + - disk.device.read.bytes + forwarder_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - forwarder + forwarder_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - forwarder + forwarder_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - forwarder + feature_cif: + - cif + - feature + binding_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - binding + network.incoming.bytes.rate_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.incoming.bytes.rate + binding_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - binding + cpu_util_cif: + - cif + - cpu_util + disk.device.write.bytes_cif: + - cif + - disk.device.write.bytes + network.outgoing.bytes_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.outgoing.bytes + feature_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - feature + network.incoming.packets_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.incoming.packets + network.incoming.packets_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.incoming.packets + feature_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - feature + network.outgoing.bytes_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.outgoing.bytes + network.outgoing.bytes_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.outgoing.bytes + binding_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - binding + disk.allocation_cif: + - cif + - disk.allocation + disk.device.iops_cif: + - cif + - disk.device.iops + disk.device.write.requests_cif: + - cif + - disk.device.write.requests + network.outpoing.packets_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.outpoing.packets + network.outgoing.packets.rate_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.outgoing.packets.rate + disk.write.bytes.rate_cif: + - cif + - disk.write.bytes.rate + host_cif: + - cif + - host + cpu.delta_cif: + - cif + - cpu.delta + scalable_cif: + - cif + - scalable + binding_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - binding + disk.device.write.bytes.rate_cif: + - cif + - disk.device.write.bytes.rate + disk.iops_cif: + - cif + - disk.iops + disk.read.bytes.rate_cif: + - cif + - disk.read.bytes.rate + network.incoming.bytes.rate_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - network.incoming.bytes.rate + disk.write.requests_cif: + - cif + - disk.write.requests + memory_cif: + - cif + - memory + attachment_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - attachment + network.outgoing.bytes.rate_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - network.outgoing.bytes.rate + disk.capacity_cif: + - cif + - disk.capacity + network.outgoing.bytes.rate_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.outgoing.bytes.rate + network.outpoing.packets_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - network.outpoing.packets + feature_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - feature attachment_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - attachment attachment_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - attachment - disk.device.read.bytes_cif: - - cif - - disk.device.read.bytes disk.device.latency_cif: - cif - disk.device.latency @@ -836,12 +857,6 @@ topology_template: network.outgoing.bytes.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.outgoing.bytes.rate - feature_cif: - - cif - - feature - binding_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - binding requirements: link_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index 2d5ae8c10f..f1e5cf1023 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -557,21 +557,12 @@ topology_template: binding_cif: - cif - binding - cpu_util_cif: - - cif - - cpu_util disk.device.read.requests_cif: - cif - disk.device.read.requests - disk.device.write.bytes_cif: - - cif - - disk.device.write.bytes disk.latency_cif: - cif - disk.latency - feature_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - feature os_cif: - cif - os @@ -590,63 +581,33 @@ topology_template: feature_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - feature - network.incoming.packets_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.incoming.packets instance_cif: - cif - instance network.incoming.bytes.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes.rate - network.outgoing.bytes_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.outgoing.bytes network.outgoing.bytes_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.bytes - network.outgoing.bytes_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.outgoing.bytes - disk.allocation_cif: - - cif - - disk.allocation - network.outgoing.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outgoing.bytes.rate network.incoming.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.packets.rate - disk.device.iops_cif: - - cif - - disk.device.iops feature_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - feature disk.root.size_cif: - cif - disk.root.size - disk.device.write.requests_cif: - - cif - - disk.device.write.requests feature_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - feature memory.resident_cif: - cif - memory.resident - network.incoming.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.bytes.rate - binding_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - binding network.outgoing.bytes_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outgoing.bytes - attachment_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - attachment network.incoming.packets.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets.rate @@ -656,30 +617,15 @@ topology_template: network.incoming.bytes_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes - attachment_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - attachment disk.usage_cif: - cif - disk.usage - disk.write.bytes.rate_cif: - - cif - - disk.write.bytes.rate - network.incoming.bytes_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.bytes - host_cif: - - cif - - host disk.ephemeral.size_cif: - cif - disk.ephemeral.size disk.write.requests.rate_cif: - cif - disk.write.requests.rate - cpu.delta_cif: - - cif - - cpu.delta disk.read.bytes_cif: - cif - disk.read.bytes @@ -689,21 +635,9 @@ topology_template: network.outgoing.packets.rate_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.outgoing.packets.rate - scalable_cif: - - cif - - scalable disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate - binding_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - binding - feature_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - feature - binding_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - binding disk.device.allocation_cif: - cif - disk.device.allocation @@ -713,9 +647,6 @@ topology_template: vcpus_cif: - cif - vcpus - disk.device.write.bytes.rate_cif: - - cif - - disk.device.write.bytes.rate network.outgoing.packets.rate_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.packets.rate @@ -731,12 +662,6 @@ topology_template: disk.device.usage_cif: - cif - disk.device.usage - disk.iops_cif: - - cif - - disk.iops - disk.read.bytes.rate_cif: - - cif - - disk.read.bytes.rate network.outpoing.packets_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outpoing.packets @@ -752,36 +677,15 @@ topology_template: network.outgoing.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.packets.rate - disk.write.requests_cif: - - cif - - disk.write.requests - binding_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - binding - memory_cif: - - cif - - memory disk.read.requests_cif: - cif - disk.read.requests - network.outgoing.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.outgoing.bytes.rate disk.write.bytes_cif: - cif - disk.write.bytes network.outpoing.packets_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outpoing.packets - disk.capacity_cif: - - cif - - disk.capacity - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.outgoing.bytes.rate network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.bytes.rate @@ -797,12 +701,6 @@ topology_template: network.incoming.packets.rate_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.incoming.packets.rate - binding_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - binding - network.incoming.packets_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.incoming.packets cpu_cif: - cif - cpu @@ -815,30 +713,147 @@ topology_template: disk.device.read.bytes_cif: - cif - disk.device.read.bytes - disk.device.latency_cif: - - cif - - disk.device.latency network.outgoing.bytes.rate_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outgoing.bytes.rate network.incoming.packets_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.incoming.packets - disk.device.write.requests.rate_cif: - - cif - - disk.device.write.requests.rate network.outpoing.packets_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.outpoing.packets feature_cif: - cif - feature - attachment_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - attachment network.incoming.bytes.rate_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.incoming.bytes.rate + cpu_util_cif: + - cif + - cpu_util + disk.device.write.bytes_cif: + - cif + - disk.device.write.bytes + feature_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - feature + network.incoming.packets_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.incoming.packets + network.outgoing.bytes_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.outgoing.bytes + network.outgoing.bytes_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.outgoing.bytes + disk.allocation_cif: + - cif + - disk.allocation + network.outgoing.bytes.rate_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - network.outgoing.bytes.rate + disk.device.iops_cif: + - cif + - disk.device.iops + disk.device.write.requests_cif: + - cif + - disk.device.write.requests + network.incoming.bytes.rate_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - network.incoming.bytes.rate + binding_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - binding + attachment_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - attachment + attachment_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - attachment + disk.write.bytes.rate_cif: + - cif + - disk.write.bytes.rate + network.incoming.bytes_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - network.incoming.bytes + host_cif: + - cif + - host + forwarder_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - forwarder + forwarder_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - forwarder + cpu.delta_cif: + - cif + - cpu.delta + scalable_cif: + - cif + - scalable + binding_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - binding + feature_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - feature + binding_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - binding + disk.device.write.bytes.rate_cif: + - cif + - disk.device.write.bytes.rate + disk.iops_cif: + - cif + - disk.iops + disk.read.bytes.rate_cif: + - cif + - disk.read.bytes.rate + forwarder_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - forwarder + disk.write.requests_cif: + - cif + - disk.write.requests + binding_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - binding + memory_cif: + - cif + - memory + network.outgoing.packets.rate_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - network.outgoing.packets.rate + network.outgoing.bytes.rate_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.outgoing.bytes.rate + disk.capacity_cif: + - cif + - disk.capacity + network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.outgoing.bytes.rate + binding_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - binding + network.incoming.packets_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.incoming.packets + forwarder_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - forwarder + disk.device.latency_cif: + - cif + - disk.device.latency + forwarder_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - forwarder + disk.device.write.requests.rate_cif: + - cif + - disk.device.write.requests.rate + attachment_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - attachment network.incoming.packets_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.incoming.packets diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 240c27f5b5..a2c4af5daf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -454,6 +454,9 @@ topology_template: disk.allocation_lbd: - lbd - disk.allocation + forwarder_lbd_lbd_dpdk_1_port: + - lbd_lbd_dpdk_1_port + - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests @@ -469,6 +472,9 @@ topology_template: memory.resident_lbd: - lbd - memory.resident + forwarder_lbd_lbd_internal_1_port: + - lbd_lbd_internal_1_port + - forwarder disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate @@ -487,6 +493,9 @@ topology_template: network.outgoing.bytes_lbd_lbd_internal_1_port: - lbd_lbd_internal_1_port - network.outgoing.bytes + forwarder_lbd_lbd_ims_core_1_port: + - lbd_lbd_ims_core_1_port + - forwarder network.incoming.packets.rate_lbd_lbd_dpdk_1_port: - lbd_lbd_dpdk_1_port - network.incoming.packets.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 6a66369963..64e5bdd8eb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -502,6 +502,9 @@ topology_template: binding_lbd_lbd_dpdk_0_port: - lbd_lbd_dpdk_0_port - binding + forwarder_lbd_lbd_ims_core_0_port: + - lbd_lbd_ims_core_0_port + - forwarder network.outgoing.bytes_lbd_lbd_internal_0_port: - lbd_lbd_internal_0_port - network.outgoing.bytes @@ -553,9 +556,15 @@ topology_template: disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes + forwarder_lbd_lbd_internal_0_port: + - lbd_lbd_internal_0_port + - forwarder disk.capacity_lbd: - lbd - disk.capacity + forwarder_lbd_lbd_dpdk_0_port: + - lbd_lbd_dpdk_0_port + - forwarder feature_lbd: - lbd - feature diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index 4919d3bcb4..ec7944d0f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -302,6 +302,9 @@ topology_template: disk.read.bytes_oam: - oam - disk.read.bytes + forwarder_oam_oam_oam_0_port: + - oam_oam_oam_0_port + - forwarder network.incoming.packets_oam_oam_internal_0_port: - oam_oam_internal_0_port - network.incoming.packets @@ -434,6 +437,9 @@ topology_template: network.incoming.bytes.rate_oam_oam_oam_0_port: - oam_oam_oam_0_port - network.incoming.bytes.rate + forwarder_oam_oam_internal_0_port: + - oam_oam_internal_0_port + - forwarder network.incoming.bytes_oam_oam_oam_0_port: - oam_oam_oam_0_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/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index 71b1bb62c8..f9da32d654 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -296,6 +296,9 @@ topology_template: disk.device.write.bytes_oam: - oam - disk.device.write.bytes + forwarder_oam_oam_internal_1_port: + - oam_oam_internal_1_port + - forwarder disk.read.bytes_oam: - oam - disk.read.bytes @@ -458,6 +461,9 @@ topology_template: disk.write.bytes_oam: - oam - disk.write.bytes + forwarder_oam_oam_oam_1_port: + - oam_oam_oam_1_port + - forwarder disk.read.requests_oam: - oam - disk.read.requests diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index f3ee061109..21a53aedc7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -356,6 +356,9 @@ topology_template: network.outgoing.bytes.rate_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outgoing.bytes.rate + forwarder_oam_oam_internal_2_port: + - oam_oam_internal_2_port + - forwarder network.outpoing.packets_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outpoing.packets @@ -374,6 +377,9 @@ topology_template: network.incoming.bytes_oam_oam_oam_2_port: - oam_oam_oam_2_port - network.incoming.bytes + forwarder_oam_oam_oam_2_port: + - oam_oam_oam_2_port + - forwarder network.outgoing.packets.rate_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outgoing.packets.rate diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml index f6b8a5d5b3..658b0d62a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml @@ -354,6 +354,9 @@ topology_template: disk.write.bytes_cscf_server_0: - cscf_server_0 - disk.write.bytes + forwarder_cscf_internal_0_port_0: + - cscf_internal_0_port_0 + - forwarder cpu.delta_cscf_server_0: - cscf_server_0 - cpu.delta diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml index aa2336cd01..65e2fb86e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml @@ -380,6 +380,9 @@ topology_template: network.incoming.packets_tdcore_dpdk_0_port_1: - tdcore_dpdk_0_port_1 - network.incoming.packets + forwarder_tdcore_dpdk_0_port_1: + - tdcore_dpdk_0_port_1 + - forwarder vcpus_tdcore_server_0: - tdcore_server_0 - vcpus @@ -452,6 +455,9 @@ topology_template: disk.write.bytes.rate_tdcore_server_0: - tdcore_server_0 - disk.write.bytes.rate + forwarder_tdcore_internal_0_port_0: + - tdcore_internal_0_port_0 + - forwarder disk.device.capacity_tdcore_server_0: - tdcore_server_0 - disk.device.capacity diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index d8c52bc864..bb22e72ef7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -423,6 +423,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_10: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -868,6 +873,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_vson_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1228,6 +1238,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1728,6 +1743,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2441,6 +2461,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_10: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2717,6 +2742,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3217,6 +3247,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3717,6 +3752,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_00: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes.rate_vson_server_oam_net_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4344,6 +4384,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_20: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_vson_server_1: type: tosca.capabilities.Node occurrences: @@ -4843,6 +4888,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_20: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_vson_server_1: type: tosca.capabilities.Node occurrences: @@ -5433,6 +5483,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_vson_server_oam_net_port_10: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_vson_server_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5509,4 +5564,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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml index fa4b53a50a..0286b378ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml @@ -347,6 +347,9 @@ topology_template: os_vson_server_1: - vson_server_1 - os + forwarder_vson_server_oam_net_port_20: + - vson_server_oam_net_port_20 + - forwarder feature_vson_server_1: - vson_server_1 - feature @@ -449,4 +452,4 @@ topology_template: - dependency dependency_vson_server_1: - vson_server_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml index 3ac286aba1..b53841145b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml @@ -385,6 +385,9 @@ topology_template: feature_vson_server_3: - vson_server_3 - feature + forwarder_vson_server_oam_net_port_10: + - vson_server_oam_net_port_10 + - forwarder disk.write.bytes_vson_server_3: - vson_server_3 - disk.write.bytes @@ -436,4 +439,4 @@ topology_template: - link dependency_vson_server_3: - vson_server_3 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml index 8292248260..5f7bbc52f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml @@ -286,6 +286,9 @@ topology_template: network.outpoing.packets_vson_server_oam_net_port_00: - vson_server_oam_net_port_00 - network.outpoing.packets + forwarder_vson_server_oam_net_port_00: + - vson_server_oam_net_port_00 + - forwarder network.outgoing.bytes.rate_vson_server_oam_net_port_00: - vson_server_oam_net_port_00 - network.outgoing.bytes.rate @@ -451,4 +454,4 @@ topology_template: - link dependency_vson_server_2: - vson_server_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml index ba15ec28b4..806a09abf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml @@ -385,6 +385,9 @@ topology_template: disk.device.capacity_vson_server: - vson_server - disk.device.capacity + forwarder_vson_server_oam_net_port_0: + - vson_server_oam_net_port_0 + - forwarder disk.device.iops_vson_server: - vson_server - disk.device.iops diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 21183acb74..593d700c0f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -612,6 +612,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_8: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_7: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_cmaui_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1030,6 +1040,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.iops_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1042,6 +1057,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port_6: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_cmaui: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1632,12 +1652,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_cmaui: 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_cmaui_cmaui_port_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cmaui_cmaui_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2349,19 +2379,24 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_4_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_cmaui_port_4_test_nested2Level: 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 - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: 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 - cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: + network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2385,17 +2420,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_6_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: 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 + attachment_cmaui_port_6_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_server_cmaui_2_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2629,9 +2664,8 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -2640,6 +2674,12 @@ node_types: occurrences: - 1 - UNBOUNDED + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + 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 disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2703,12 +2743,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.usage_server_cmaui_2_test_nested2Level: 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_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_cmaui_port_4_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2757,6 +2807,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_3_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2792,6 +2847,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3036,6 +3096,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3149,13 +3214,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + network.outpoing.packets_cmaui_port_3_test_nested2Level: 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 - network.outpoing.packets_cmaui_port_3_test_nested2Level: + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3495,13 +3560,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Node + binding_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - binding_server_cmaui_2_test_nested2Level: - type: tosca.capabilities.network.Bindable + feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3660,6 +3725,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3933,6 +4003,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_cmaui_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_cmaui_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cmaui_cmaui_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4454,1050 +4534,1099 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui_2: - 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 - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.latency_server_cmaui_2: 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 - disk.device.latency_server_cmaui_2: + disk.root.size_server_cmaui_2: 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 - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.read.requests_server_cmaui_3_test_nested3Level: 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 - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.latency_server_cmaui_3_test_nested3Level: 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 - disk.root.size_server_cmaui_2: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: 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 - disk.device.write.requests.rate_server_cmaui_2: + network.outgoing.bytes_cmaui_port_3: 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 - disk.read.requests_server_cmaui_3_test_nested3Level: + disk.read.requests_server_cmaui_2: 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 - disk.latency_server_cmaui_3_test_nested3Level: + disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.write.bytes.rate_server_cmaui_3_test_nested3Level: + disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.outgoing.bytes_cmaui_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_7_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin + host_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_2: + disk.device.read.bytes.rate_server_cmaui_2: 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 - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.read.bytes_server_cmaui_2: 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 - feature_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Node + disk.device.read.bytes_server_cmaui_2: + 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 - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.device.iops_server_cmaui_2: + disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.write.requests.rate_server_cmaui_2: 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 - disk.device.capacity_server_cmaui_2: + disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - attachment_cmaui_port_7_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: + 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 - host_server_cmaui_4_test_nested4Level_test_nested3Level: + host_server_cmaui_3_test_nested3Level: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui_2: + disk.allocation_server_cmaui_3_test_nested3Level: 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 - disk.ephemeral.size_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_6_test_nested3Level: 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 - disk.read.bytes_server_cmaui_2: + network.incoming.packets.rate_cmaui_port_6_test_nested3Level: 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 - disk.device.read.bytes_server_cmaui_2: + disk.ephemeral.size_server_cmaui_2: 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 - disk.device.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: + cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.root.size_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.write.requests_server_cmaui_3_test_nested3Level: 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 - disk.write.requests.rate_server_cmaui_2: + network.outpoing.packets_cmaui_port_5_test_nested3Level: 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 - disk.iops_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: 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 - network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: + disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - memory_server_cmaui_2: + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: 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 - cpu_server_cmaui_2: + binding_cmaui_port_3: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_4: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.requests_server_cmaui_2: 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 - host_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_cmaui_port_6_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_8_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui_3_test_nested3Level: + memory_server_cmaui_3_test_nested3Level: 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 - memory_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: 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 - network.incoming.packets_cmaui_port_4: + binding_cmaui_port_6_test_nested3Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.usage_server_cmaui_3_test_nested3Level: 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 - network.outgoing.bytes_cmaui_port_6_test_nested3Level: + network.incoming.bytes_cmaui_port_4: 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 - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: + network.incoming.bytes_cmaui_port_3: 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 - network.incoming.packets.rate_cmaui_port_6_test_nested3Level: + disk.device.latency_server_cmaui_3_test_nested3Level: 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 - disk.ephemeral.size_server_cmaui_2: + cpu_util_server_cmaui_2: 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 - cpu.delta_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.write.bytes.rate_server_cmaui_2: 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 - disk.write.requests_server_cmaui_3_test_nested3Level: + disk.write.bytes.rate_server_cmaui_2: 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 - network.outpoing.packets_cmaui_port_5_test_nested3Level: + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.capacity_server_cmaui_2: + disk.device.write.bytes_server_cmaui_2: 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 - network.incoming.packets_cmaui_port_6_test_nested3Level: + network.incoming.packets.rate_cmaui_port_3: 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 - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: + cpu_server_cmaui_3_test_nested3Level: 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 - network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + network.incoming.packets.rate_cmaui_port_4: 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 - disk.read.bytes.rate_server_cmaui_3_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - binding_cmaui_port_3: + binding_server_cmaui_2: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - disk.iops_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - binding_cmaui_port_4: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_2: + network.incoming.packets.rate_cmaui_port_5_test_nested3Level: 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 - feature_cmaui_port_6_test_nested3Level: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: + 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 - feature_cmaui_port_8_test_nested4Level_test_nested3Level: + feature_server_cmaui_4_test_nested4Level_test_nested3Level: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_cmaui_3_test_nested3Level: + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.incoming.bytes.rate_cmaui_port_6_test_nested3Level: + endpoint_server_cmaui_2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - feature_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.Node + forwarder_cmaui_port_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_3: + scalable_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + forwarder_cmaui_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: + disk.device.allocation_server_cmaui_2: 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 - disk.root.size_server_cmaui_3_test_nested3Level: + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.outgoing.bytes.rate_cmaui_port_4: + disk.read.bytes_server_cmaui_3_test_nested3Level: 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 - binding_cmaui_port_6_test_nested3Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.allocation_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.usage_server_cmaui_3_test_nested3Level: + network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: 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 - os_server_cmaui_4_test_nested4Level_test_nested3Level: + os_server_cmaui_3_test_nested3Level: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui_3_test_nested3Level: + network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - network.incoming.bytes_cmaui_port_4: + cpu_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.incoming.bytes_cmaui_port_3: + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_8_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_3_test_nested3Level: + instance_server_cmaui_2: 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 - cpu_util_server_cmaui_2: + disk.device.iops_server_cmaui_3_test_nested3Level: 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 - memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + network.incoming.bytes_cmaui_port_5_test_nested3Level: 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 - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: + network.outpoing.packets_cmaui_port_6_test_nested3Level: 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 - network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - disk.device.write.bytes.rate_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_port_5_test_nested3Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.write.bytes.rate_server_cmaui_2: + disk.device.write.bytes_server_cmaui_3_test_nested3Level: 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 - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_5_test_nested3Level: 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 - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.read.requests_server_cmaui_2: 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 - network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: + network.outpoing.packets_cmaui_port_3: 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 - disk.device.write.bytes_server_cmaui_2: + disk.capacity_server_cmaui_3_test_nested3Level: 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 - feature_cmaui_port_7_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Node + cpu.delta_server_cmaui_2: + 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 - disk.iops_server_cmaui_3_test_nested3Level: + network.outpoing.packets_cmaui_port_4: 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 - network.incoming.packets.rate_cmaui_port_3: + network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - cpu_server_cmaui_3_test_nested3Level: + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - feature_cmaui_port_3: - type: tosca.capabilities.Node + binding_cmaui_port_8_test_nested4Level_test_nested3Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.write.bytes_server_cmaui_2: + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.incoming.packets.rate_cmaui_port_4: + network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: 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 - feature_server_cmaui_2: - type: tosca.capabilities.Node + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + 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 - feature_cmaui_port_4: - type: tosca.capabilities.Node + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + 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 - attachment_cmaui_port_6_test_nested3Level: - type: tosca.capabilities.Attachment + memory.resident_server_cmaui_3_test_nested3Level: + 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 - network.outgoing.packets.rate_cmaui_port_6_test_nested3Level: + disk.device.usage_server_cmaui_2: 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 - disk.allocation_server_cmaui_2: + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: + network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - binding_server_cmaui_2: - type: tosca.capabilities.network.Bindable + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + 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 - vcpus_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_6_test_nested3Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_4: + disk.device.write.requests.rate_server_cmaui_2: 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 - instance_server_cmaui_3_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_7_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_3: - type: tosca.capabilities.Attachment + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_4: - type: tosca.capabilities.Attachment + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: + 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 - scalable_server_cmaui_2: - type: tosca.capabilities.Scalable + feature_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.iops_server_cmaui_2: 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 - network.outgoing.packets.rate_cmaui_port_3: + disk.device.capacity_server_cmaui_2: 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 - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: + memory_server_cmaui_2: 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 - network.incoming.packets.rate_cmaui_port_5_test_nested3Level: + cpu_server_cmaui_2: 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 - disk.write.requests_server_cmaui_2: + network.incoming.packets_cmaui_port_3: 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 - memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level: + memory_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_8_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_2: + network.incoming.packets_cmaui_port_4: 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 - disk.device.usage_server_cmaui_3_test_nested3Level: + network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - disk.write.bytes_server_cmaui_3_test_nested3Level: + disk.capacity_server_cmaui_2: 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 - feature_server_cmaui_4_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Node + network.incoming.packets_cmaui_port_6_test_nested3Level: + 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 - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - binding_cmaui_port_7_test_nested4Level_test_nested3Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_3_test_nested3Level: + disk.iops_server_cmaui_2: 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 - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + network.incoming.bytes.rate_cmaui_port_6_test_nested3Level: 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 - endpoint_server_cmaui_2: - type: tosca.capabilities.Endpoint.Admin + feature_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_6_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_3: 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 - os_server_cmaui_2: - type: tosca.capabilities.OperatingSystem + disk.root.size_server_cmaui_3_test_nested3Level: + 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 - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_4: 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 - scalable_server_cmaui_4_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Scalable + os_server_cmaui_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + disk.device.write.requests_server_cmaui_3_test_nested3Level: 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 - attachment_cmaui_port_5_test_nested3Level: - type: tosca.capabilities.Attachment + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: + 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 - disk.device.allocation_server_cmaui_2: + memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: 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 - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - disk.read.bytes_server_cmaui_3_test_nested3Level: + disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - disk.device.allocation_server_cmaui_3_test_nested3Level: + feature_cmaui_port_7_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level: 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 - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: + disk.write.bytes_server_cmaui_2: 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 - host_server_cmaui_2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + feature_server_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - os_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.OperatingSystem + attachment_cmaui_port_6_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_6_test_nested3Level: 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 - disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.allocation_server_cmaui_2: 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 - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: + vcpus_server_cmaui_2: 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 - binding_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.network.Bindable + network.outgoing.packets.rate_cmaui_port_4: + 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 - feature_test_nested3Level: - type: tosca.capabilities.Node + instance_server_cmaui_3_test_nested3Level: + 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 - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + attachment_cmaui_port_3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_4: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - cpu_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.packets.rate_cmaui_port_3: 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 - cpu.delta_server_cmaui_3_test_nested3Level: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: 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 - disk.device.capacity_server_cmaui_3_test_nested3Level: + disk.write.requests_server_cmaui_2: 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 - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - attachment_cmaui_port_8_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Attachment + disk.usage_server_cmaui_2: + 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 - scalable_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.Scalable + disk.device.usage_server_cmaui_3_test_nested3Level: + 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 - instance_server_cmaui_2: + disk.write.bytes_server_cmaui_3_test_nested3Level: 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 - disk.device.iops_server_cmaui_3_test_nested3Level: + network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + binding_cmaui_port_7_test_nested4Level_test_nested3Level: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3_test_nested3Level: 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 - network.incoming.bytes_cmaui_port_5_test_nested3Level: + network.incoming.bytes_cmaui_port_6_test_nested3Level: 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 - endpoint_server_cmaui_3_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui_3_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_5_test_nested3Level: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.outpoing.packets_cmaui_port_6_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_cmaui_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_4: + disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - binding_cmaui_port_5_test_nested3Level: + binding_server_cmaui_3_test_nested3Level: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_test_nested3Level: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_4: + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: 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 - disk.device.write.bytes_server_cmaui_3_test_nested3Level: + cpu.delta_server_cmaui_3_test_nested3Level: 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 - network.outgoing.bytes_cmaui_port_5_test_nested3Level: + disk.device.capacity_server_cmaui_3_test_nested3Level: 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 - disk.device.read.requests_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - disk.read.bytes.rate_server_cmaui_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_3: + vcpus_server_cmaui_3_test_nested3Level: 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 - disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + network.incoming.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: 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 - disk.capacity_server_cmaui_3_test_nested3Level: + disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - cpu.delta_server_cmaui_2: + network.outgoing.bytes_cmaui_port_4: 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 - disk.device.read.requests.rate_server_cmaui_2: + network.incoming.bytes.rate_cmaui_port_3: 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 - network.outpoing.packets_cmaui_port_4: + network.incoming.bytes.rate_cmaui_port_4: 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 - binding_server_cmaui_4_test_nested4Level_test_nested3Level: - type: tosca.capabilities.network.Bindable + disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + 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 - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + disk.read.bytes.rate_server_cmaui_2: 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 - memory.resident_server_cmaui_2: + disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: 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 - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + disk.device.read.requests.rate_server_cmaui_2: 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 - binding_cmaui_port_8_test_nested4Level_test_nested3Level: + binding_server_cmaui_4_test_nested4Level_test_nested3Level: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + memory.resident_server_cmaui_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5532,27 +5661,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: - 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 - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - 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 - disk.device.read.bytes_server_cmaui_3_test_nested3Level: - 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 - memory.resident_server_cmaui_3_test_nested3Level: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cmaui_port_5_test_nested3Level: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -5728,12 +5838,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_7_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_cmaui_4_test_nested4Level: 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_cmaui_port_8_test_nested4Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_cmaui_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6279,6 +6399,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_6: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6291,6 +6416,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cmaui_port_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_server_cmaui_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6452,4 +6582,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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml index 19b136037d..c73e74aaca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml @@ -234,12 +234,18 @@ topology_template: disk.device.write.bytes_cmaui: - cmaui - disk.device.write.bytes + forwarder_cmaui_cmaui_port_5: + - cmaui_cmaui_port_5 + - forwarder disk.device.iops_cmaui: - cmaui - disk.device.iops memory.resident_cmaui: - cmaui - memory.resident + forwarder_cmaui_cmaui_port_6: + - cmaui_cmaui_port_6 + - forwarder disk.write.bytes.rate_cmaui: - cmaui - 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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml index 56e45c96f1..cea4ae985c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml @@ -252,9 +252,15 @@ topology_template: network.incoming.bytes_cmaui_cmaui_port_4: - cmaui_cmaui_port_4 - network.incoming.bytes + forwarder_cmaui_cmaui_port_3: + - cmaui_cmaui_port_3 + - forwarder disk.read.bytes_cmaui: - cmaui - disk.read.bytes + forwarder_cmaui_cmaui_port_4: + - cmaui_cmaui_port_4 + - forwarder network.incoming.bytes_cmaui_cmaui_port_3: - cmaui_cmaui_port_3 - network.incoming.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 3414e296bc..3c0a520290 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -252,6 +252,12 @@ topology_template: disk.device.allocation_cmaui: - cmaui - disk.device.allocation + forwarder_cmaui_cmaui_port_1: + - cmaui_cmaui_port_1 + - forwarder + forwarder_cmaui_cmaui_port_2: + - cmaui_cmaui_port_2 + - forwarder network.incoming.bytes_cmaui_cmaui_port_2: - cmaui_cmaui_port_2 - network.incoming.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index ace6aa3818..e543c21f8e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml @@ -228,15 +228,18 @@ topology_template: disk.device.read.bytes_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.read.bytes_server_cmaui_2 + forwarder_cmaui_port_4_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_4 network.incoming.packets_cmaui_port_4_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_4 - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level cpu_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - cpu_server_cmaui_4_test_nested4Level_test_nested3Level + network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_cmaui_2 @@ -246,12 +249,12 @@ topology_template: network.incoming.bytes_cmaui_port_3_test_nested2Level: - test_nested2Level - network.incoming.bytes_cmaui_port_3 - attachment_cmaui_port_6_test_nested3Level_test_nested2Level: - - test_nested2Level - - attachment_cmaui_port_6_test_nested3Level network.incoming.packets.rate_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets.rate_cmaui_port_5_test_nested3Level + attachment_cmaui_port_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - attachment_cmaui_port_6_test_nested3Level disk.read.bytes_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.read.bytes_server_cmaui_2 @@ -369,12 +372,15 @@ topology_template: binding_server_cmaui_1: - abstract_cmaui_2 - binding_cmaui - disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + forwarder_cmaui_port_5_test_nested3Level_test_nested2Level: - test_nested2Level - - disk.root.size_server_cmaui_3_test_nested3Level + - forwarder_cmaui_port_5_test_nested3Level os_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - os_server_cmaui_3_test_nested3Level + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_3_test_nested3Level disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level @@ -408,9 +414,15 @@ topology_template: os_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - os_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_cmaui_port_2: + - abstract_cmaui_2 + - forwarder_cmaui_cmaui_port_2 disk.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - disk.usage_server_cmaui_2 + forwarder_cmaui_port_1: + - abstract_cmaui_2 + - forwarder_cmaui_cmaui_port_1 network.outgoing.packets.rate_cmaui_port_4_test_nested2Level: - test_nested2Level - network.outgoing.packets.rate_cmaui_port_4 @@ -435,6 +447,9 @@ topology_template: memory_server_cmaui_1: - abstract_cmaui_2 - memory_cmaui + forwarder_cmaui_port_3_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_3 disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_cmaui_3_test_nested3Level @@ -453,6 +468,9 @@ topology_template: disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - disk.read.requests_server_cmaui_3_test_nested3Level + forwarder_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_8_test_nested4Level_test_nested3Level vcpus_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level @@ -579,6 +597,9 @@ topology_template: disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level + forwarder_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_7_test_nested4Level_test_nested3Level disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level @@ -636,12 +657,12 @@ topology_template: scalable_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - scalable_server_cmaui_4_test_nested4Level_test_nested3Level - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level network.outpoing.packets_cmaui_port_3_test_nested2Level: - test_nested2Level - network.outpoing.packets_cmaui_port_3 + network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level network.incoming.packets_cmaui_port_6_test_nested3Level_test_nested2Level: - test_nested2Level - network.incoming.packets_cmaui_port_6_test_nested3Level @@ -813,12 +834,12 @@ topology_template: host_server_cmaui_1: - abstract_cmaui_2 - host_cmaui - feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - feature_cmaui_port_7_test_nested4Level_test_nested3Level binding_server_cmaui_2_test_nested2Level: - test_nested2Level - binding_server_cmaui_2 + feature_cmaui_port_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_cmaui_port_7_test_nested4Level_test_nested3Level cpu.delta_server_cmaui_2_test_nested2Level: - test_nested2Level - cpu.delta_server_cmaui_2 @@ -897,6 +918,9 @@ topology_template: memory.resident_server_cmaui_1: - abstract_cmaui_2 - memory.resident_cmaui + forwarder_cmaui_port_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_6_test_nested3Level disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level @@ -990,4 +1014,4 @@ topology_template: - dependency_cmaui dependency_cmaui_port_4_test_nested2Level: - test_nested2Level - - dependency_cmaui_port_4
\ No newline at end of file + - dependency_cmaui_port_4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index 33ae55e5cd..67af3b2fa7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -160,27 +160,12 @@ topology_template: cpu_util_server_cmaui_3_test_nested3Level: - test_nested3Level - cpu_util_server_cmaui_3 - disk.device.usage_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.usage_cmaui - disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.usage_server_cmaui_4_test_nested4Level disk.device.latency_server_cmaui_2: - abstract_cmaui_1 - disk.device.latency_cmaui - network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.incoming.bytes_cmaui_port_7_test_nested4Level - disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.usage_server_cmaui_4_test_nested4Level disk.root.size_server_cmaui_2: - abstract_cmaui_1 - disk.root.size_cmaui - disk.device.write.requests.rate_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.write.requests.rate_cmaui disk.read.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.read.requests_server_cmaui_3 @@ -193,33 +178,15 @@ topology_template: network.outgoing.bytes_cmaui_port_3: - abstract_cmaui_1 - network.outgoing.bytes_cmaui_cmaui_port_3 - endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - endpoint_server_cmaui_4_test_nested4Level disk.read.requests_server_cmaui_2: - abstract_cmaui_1 - disk.read.requests_cmaui - cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - cpu_util_server_cmaui_4_test_nested4Level disk.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.write.bytes.rate_server_cmaui_4_test_nested4Level - feature_test_nested4Level_test_nested3Level: - - test_nested3Level - - feature_test_nested4Level - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level - disk.device.iops_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.iops_cmaui disk.device.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.write.bytes_server_cmaui_4_test_nested4Level - disk.device.capacity_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.capacity_cmaui attachment_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - attachment_cmaui_port_7_test_nested4Level @@ -253,33 +220,15 @@ topology_template: network.outgoing.bytes.rate_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_5 - memory_server_cmaui_2: - - abstract_cmaui_1 - - memory_cmaui - cpu_server_cmaui_2: - - abstract_cmaui_1 - - cpu_cmaui host_server_cmaui_3_test_nested3Level: - test_nested3Level - host_server_cmaui_3 - network.incoming.packets_cmaui_port_3: - - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui_port_3 disk.allocation_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.allocation_server_cmaui_3 - memory_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - memory_server_cmaui_4_test_nested4Level - network.incoming.packets_cmaui_port_4: - - abstract_cmaui_1 - - network.incoming.packets_cmaui_cmaui_port_4 network.outgoing.bytes_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_6 - network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.outgoing.bytes_cmaui_port_7_test_nested4Level network.incoming.packets.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.packets.rate_cmaui_port_6 @@ -295,15 +244,6 @@ topology_template: network.outpoing.packets_cmaui_port_5_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_5 - disk.capacity_server_cmaui_2: - - abstract_cmaui_1 - - disk.capacity_cmaui - network.incoming.packets_cmaui_port_6_test_nested3Level: - - test_nested3Level - - network.incoming.packets_cmaui_port_6 - network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.incoming.bytes_cmaui_port_8_test_nested4Level network.outgoing.bytes.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_6 @@ -313,15 +253,9 @@ topology_template: disk.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.read.bytes.rate_server_cmaui_3 - disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.iops_server_cmaui_4_test_nested4Level binding_cmaui_port_3: - abstract_cmaui_1 - binding_cmaui_cmaui_port_3 - disk.iops_server_cmaui_2: - - abstract_cmaui_1 - - disk.iops_cmaui binding_cmaui_port_4: - abstract_cmaui_1 - binding_cmaui_cmaui_port_4 @@ -337,6 +271,264 @@ topology_template: memory_server_cmaui_3_test_nested3Level: - test_nested3Level - memory_server_cmaui_3 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes.rate_server_cmaui_3 + binding_cmaui_port_6_test_nested3Level: + - test_nested3Level + - binding_cmaui_port_6 + disk.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.usage_server_cmaui_3 + network.incoming.bytes_cmaui_port_4: + - abstract_cmaui_1 + - network.incoming.bytes_cmaui_cmaui_port_4 + network.incoming.bytes_cmaui_port_3: + - abstract_cmaui_1 + - network.incoming.bytes_cmaui_cmaui_port_3 + disk.device.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.latency_server_cmaui_3 + cpu_util_server_cmaui_2: + - abstract_cmaui_1 + - cpu_util_cmaui + disk.device.write.bytes.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.write.bytes.rate_cmaui + disk.write.bytes.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.write.bytes.rate_cmaui + vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - vcpus_server_cmaui_4_test_nested4Level + disk.device.write.bytes_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.write.bytes_cmaui + network.incoming.packets.rate_cmaui_port_3: + - abstract_cmaui_1 + - network.incoming.packets.rate_cmaui_cmaui_port_3 + cpu_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu_server_cmaui_3 + feature_cmaui_port_3: + - abstract_cmaui_1 + - feature_cmaui_cmaui_port_3 + network.incoming.packets.rate_cmaui_port_4: + - abstract_cmaui_1 + - network.incoming.packets.rate_cmaui_cmaui_port_4 + feature_cmaui_port_4: + - abstract_cmaui_1 + - feature_cmaui_cmaui_port_4 + disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.allocation_server_cmaui_4_test_nested4Level + binding_server_cmaui_2: + - abstract_cmaui_1 + - binding_cmaui + scalable_server_cmaui_2: + - abstract_cmaui_1 + - scalable_cmaui + disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.write.requests.rate_server_cmaui_4_test_nested4Level + network.incoming.packets.rate_cmaui_port_5_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_cmaui_port_5 + network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_cmaui_port_7_test_nested4Level + feature_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_server_cmaui_4_test_nested4Level + disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes_server_cmaui_4_test_nested4Level + endpoint_server_cmaui_2: + - abstract_cmaui_1 + - endpoint_cmaui + disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.read.requests_server_cmaui_4_test_nested4Level + forwarder_cmaui_port_4: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui_port_4 + scalable_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - scalable_server_cmaui_4_test_nested4Level + forwarder_cmaui_port_3: + - abstract_cmaui_1 + - forwarder_cmaui_cmaui_port_3 + network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_cmaui_port_8_test_nested4Level + disk.device.allocation_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.allocation_cmaui + disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.latency_server_cmaui_4_test_nested4Level + disk.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.read.bytes_server_cmaui_3 + disk.device.allocation_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.allocation_server_cmaui_3 + network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_cmaui_port_5 + os_server_cmaui_3_test_nested3Level: + - test_nested3Level + - os_server_cmaui_3 + network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.incoming.packets_cmaui_port_8_test_nested4Level + cpu_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - cpu_server_cmaui_4_test_nested4Level + disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level + attachment_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - attachment_cmaui_port_8_test_nested4Level + instance_server_cmaui_2: + - abstract_cmaui_1 + - instance_cmaui + disk.device.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.iops_server_cmaui_3 + network.incoming.bytes_cmaui_port_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_cmaui_port_5 + network.outpoing.packets_cmaui_port_6_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_cmaui_port_6 + network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level + binding_cmaui_port_5_test_nested3Level: + - test_nested3Level + - binding_cmaui_port_5 + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes_server_cmaui_3 + network.outgoing.bytes_cmaui_port_5_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_cmaui_port_5 + disk.device.read.requests_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.read.requests_cmaui + network.outpoing.packets_cmaui_port_3: + - abstract_cmaui_1 + - network.outpoing.packets_cmaui_cmaui_port_3 + disk.capacity_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.capacity_server_cmaui_3 + cpu.delta_server_cmaui_2: + - abstract_cmaui_1 + - cpu.delta_cmaui + network.outpoing.packets_cmaui_port_4: + - abstract_cmaui_1 + - network.outpoing.packets_cmaui_cmaui_port_4 + network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level + disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level + binding_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - binding_cmaui_port_8_test_nested4Level + disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.write.bytes_server_cmaui_4_test_nested4Level + network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_cmaui_port_5 + disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes_server_cmaui_3 + memory.resident_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory.resident_server_cmaui_3 + disk.device.usage_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.usage_cmaui + disk.device.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.usage_server_cmaui_4_test_nested4Level + network.incoming.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_cmaui_port_7_test_nested4Level + disk.usage_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.usage_server_cmaui_4_test_nested4Level + forwarder_cmaui_port_6_test_nested3Level: + - test_nested3Level + - forwarder_cmaui_port_6 + disk.device.write.requests.rate_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.write.requests.rate_cmaui + forwarder_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_cmaui_port_7_test_nested4Level + endpoint_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - endpoint_server_cmaui_4_test_nested4Level + cpu_util_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - cpu_util_server_cmaui_4_test_nested4Level + feature_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_test_nested4Level + network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes.rate_cmaui_port_8_test_nested4Level + disk.device.iops_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.iops_cmaui + disk.device.capacity_server_cmaui_2: + - abstract_cmaui_1 + - disk.device.capacity_cmaui + memory_server_cmaui_2: + - abstract_cmaui_1 + - memory_cmaui + cpu_server_cmaui_2: + - abstract_cmaui_1 + - cpu_cmaui + network.incoming.packets_cmaui_port_3: + - abstract_cmaui_1 + - network.incoming.packets_cmaui_cmaui_port_3 + memory_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - memory_server_cmaui_4_test_nested4Level + forwarder_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - forwarder_cmaui_port_8_test_nested4Level + network.incoming.packets_cmaui_port_4: + - abstract_cmaui_1 + - network.incoming.packets_cmaui_cmaui_port_4 + network.outgoing.bytes_cmaui_port_7_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_cmaui_port_7_test_nested4Level + disk.capacity_server_cmaui_2: + - abstract_cmaui_1 + - disk.capacity_cmaui + network.incoming.packets_cmaui_port_6_test_nested3Level: + - test_nested3Level + - network.incoming.packets_cmaui_port_6 + network.incoming.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_cmaui_port_8_test_nested4Level + disk.device.iops_server_cmaui_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - disk.device.iops_server_cmaui_4_test_nested4Level + disk.iops_server_cmaui_2: + - abstract_cmaui_1 + - disk.iops_cmaui network.incoming.bytes.rate_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_6 @@ -346,42 +538,21 @@ topology_template: network.outgoing.bytes.rate_cmaui_port_3: - abstract_cmaui_1 - network.outgoing.bytes.rate_cmaui_cmaui_port_3 - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes.rate_server_cmaui_3 disk.root.size_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.root.size_server_cmaui_3 network.outgoing.bytes.rate_cmaui_port_4: - abstract_cmaui_1 - network.outgoing.bytes.rate_cmaui_cmaui_port_4 - binding_cmaui_port_6_test_nested3Level: - - test_nested3Level - - binding_cmaui_port_6 - disk.usage_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.usage_server_cmaui_3 os_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - os_server_cmaui_4_test_nested4Level disk.device.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_cmaui_3 - network.incoming.bytes_cmaui_port_4: - - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui_port_4 - network.incoming.bytes_cmaui_port_3: - - abstract_cmaui_1 - - network.incoming.bytes_cmaui_cmaui_port_3 disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.requests.rate_server_cmaui_3 - disk.device.latency_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.latency_server_cmaui_3 - cpu_util_server_cmaui_2: - - abstract_cmaui_1 - - cpu_util_cmaui memory.usage_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - memory.usage_server_cmaui_4_test_nested4Level @@ -391,51 +562,24 @@ topology_template: network.outgoing.bytes_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes_cmaui_port_8_test_nested4Level - disk.device.write.bytes.rate_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.write.bytes.rate_cmaui - disk.write.bytes.rate_server_cmaui_2: - - abstract_cmaui_1 - - disk.write.bytes.rate_cmaui disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_cmaui_4_test_nested4Level - vcpus_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - vcpus_server_cmaui_4_test_nested4Level network.outpoing.packets_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outpoing.packets_cmaui_port_8_test_nested4Level - disk.device.write.bytes_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.write.bytes_cmaui feature_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - feature_cmaui_port_7_test_nested4Level disk.iops_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.iops_server_cmaui_3 - network.incoming.packets.rate_cmaui_port_3: - - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui_port_3 - cpu_server_cmaui_3_test_nested3Level: - - test_nested3Level - - cpu_server_cmaui_3 - feature_cmaui_port_3: - - abstract_cmaui_1 - - feature_cmaui_cmaui_port_3 disk.write.bytes_server_cmaui_2: - abstract_cmaui_1 - disk.write.bytes_cmaui - network.incoming.packets.rate_cmaui_port_4: - - abstract_cmaui_1 - - network.incoming.packets.rate_cmaui_cmaui_port_4 feature_server_cmaui_2: - abstract_cmaui_1 - feature_cmaui - feature_cmaui_port_4: - - abstract_cmaui_1 - - feature_cmaui_cmaui_port_4 attachment_cmaui_port_6_test_nested3Level: - test_nested3Level - attachment_cmaui_port_6 @@ -445,12 +589,6 @@ topology_template: disk.allocation_server_cmaui_2: - abstract_cmaui_1 - disk.allocation_cmaui - disk.device.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.allocation_server_cmaui_4_test_nested4Level - binding_server_cmaui_2: - - abstract_cmaui_1 - - binding_cmaui vcpus_server_cmaui_2: - abstract_cmaui_1 - vcpus_cmaui @@ -466,12 +604,6 @@ topology_template: attachment_cmaui_port_4: - abstract_cmaui_1 - attachment_cmaui_cmaui_port_4 - scalable_server_cmaui_2: - - abstract_cmaui_1 - - scalable_cmaui - disk.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.write.requests.rate_server_cmaui_4_test_nested4Level disk.capacity_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.capacity_server_cmaui_4_test_nested4Level @@ -481,18 +613,12 @@ topology_template: disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.bytes.rate_server_cmaui_3 - network.incoming.packets.rate_cmaui_port_5_test_nested3Level: - - test_nested3Level - - network.incoming.packets.rate_cmaui_port_5 disk.write.requests_server_cmaui_2: - abstract_cmaui_1 - disk.write.requests_cmaui memory.resident_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - memory.resident_server_cmaui_4_test_nested4Level - network.outpoing.packets_cmaui_port_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.outpoing.packets_cmaui_port_7_test_nested4Level disk.usage_server_cmaui_2: - abstract_cmaui_1 - disk.usage_cmaui @@ -502,9 +628,6 @@ topology_template: disk.write.bytes_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.write.bytes_server_cmaui_3 - feature_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - feature_server_cmaui_4_test_nested4Level network.incoming.bytes.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.bytes.rate_cmaui_port_8_test_nested4Level @@ -514,66 +637,30 @@ topology_template: disk.write.requests.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.write.requests.rate_server_cmaui_3 - disk.device.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.read.bytes_server_cmaui_4_test_nested4Level - endpoint_server_cmaui_2: - - abstract_cmaui_1 - - endpoint_cmaui network.incoming.bytes_cmaui_port_6_test_nested3Level: - test_nested3Level - network.incoming.bytes_cmaui_port_6 os_server_cmaui_2: - abstract_cmaui_1 - os_cmaui - disk.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.read.requests_server_cmaui_4_test_nested4Level - scalable_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - scalable_server_cmaui_4_test_nested4Level - network.incoming.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.incoming.packets.rate_cmaui_port_8_test_nested4Level attachment_cmaui_port_5_test_nested3Level: - test_nested3Level - attachment_cmaui_port_5 - disk.device.allocation_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.allocation_cmaui network.incoming.packets_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.incoming.packets_cmaui_port_7_test_nested4Level - disk.device.latency_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.latency_server_cmaui_4_test_nested4Level - disk.read.bytes_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.read.bytes_server_cmaui_3 disk.latency_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.latency_server_cmaui_4_test_nested4Level - disk.device.allocation_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.allocation_server_cmaui_3 - network.incoming.bytes.rate_cmaui_port_5_test_nested3Level: - - test_nested3Level - - network.incoming.bytes.rate_cmaui_port_5 host_server_cmaui_2: - abstract_cmaui_1 - host_cmaui - os_server_cmaui_3_test_nested3Level: - - test_nested3Level - - os_server_cmaui_3 disk.read.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.read.bytes_server_cmaui_4_test_nested4Level disk.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.write.requests_server_cmaui_4_test_nested4Level - network.incoming.packets_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.incoming.packets_cmaui_port_8_test_nested4Level binding_server_cmaui_3_test_nested3Level: - test_nested3Level - binding_server_cmaui_3 @@ -583,36 +670,18 @@ topology_template: network.outgoing.packets.rate_cmaui_port_8_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.packets.rate_cmaui_port_8_test_nested4Level - cpu_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - cpu_server_cmaui_4_test_nested4Level cpu.delta_server_cmaui_3_test_nested3Level: - test_nested3Level - cpu.delta_server_cmaui_3 disk.device.capacity_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.capacity_server_cmaui_3 - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes.rate_server_cmaui_4_test_nested4Level - attachment_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - attachment_cmaui_port_8_test_nested4Level scalable_server_cmaui_3_test_nested3Level: - test_nested3Level - scalable_server_cmaui_3 - instance_server_cmaui_2: - - abstract_cmaui_1 - - instance_cmaui - disk.device.iops_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.iops_server_cmaui_3 network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - test_nested3Level - network.outgoing.bytes.rate_cmaui_port_7_test_nested4Level - network.incoming.bytes_cmaui_port_5_test_nested3Level: - - test_nested3Level - - network.incoming.bytes_cmaui_port_5 endpoint_server_cmaui_3_test_nested3Level: - test_nested3Level - endpoint_server_cmaui_3 @@ -625,75 +694,33 @@ topology_template: disk.allocation_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.allocation_server_cmaui_4_test_nested4Level - network.outpoing.packets_cmaui_port_6_test_nested3Level: - - test_nested3Level - - network.outpoing.packets_cmaui_port_6 network.outgoing.bytes_cmaui_port_4: - abstract_cmaui_1 - network.outgoing.bytes_cmaui_cmaui_port_4 - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.outgoing.packets.rate_cmaui_port_7_test_nested4Level - binding_cmaui_port_5_test_nested3Level: - - test_nested3Level - - binding_cmaui_port_5 network.incoming.bytes.rate_cmaui_port_3: - abstract_cmaui_1 - network.incoming.bytes.rate_cmaui_cmaui_port_3 network.incoming.bytes.rate_cmaui_port_4: - abstract_cmaui_1 - network.incoming.bytes.rate_cmaui_cmaui_port_4 - disk.device.write.bytes_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.write.bytes_server_cmaui_3 - network.outgoing.bytes_cmaui_port_5_test_nested3Level: - - test_nested3Level - - network.outgoing.bytes_cmaui_port_5 - disk.device.read.requests_server_cmaui_2: - - abstract_cmaui_1 - - disk.device.read.requests_cmaui disk.device.read.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.read.requests_server_cmaui_4_test_nested4Level disk.read.bytes.rate_server_cmaui_2: - abstract_cmaui_1 - disk.read.bytes.rate_cmaui - network.outpoing.packets_cmaui_port_3: - - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui_port_3 disk.device.write.requests_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - disk.device.write.requests_server_cmaui_4_test_nested4Level - disk.capacity_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.capacity_server_cmaui_3 - cpu.delta_server_cmaui_2: - - abstract_cmaui_1 - - cpu.delta_cmaui disk.device.read.requests.rate_server_cmaui_2: - abstract_cmaui_1 - disk.device.read.requests.rate_cmaui - network.outpoing.packets_cmaui_port_4: - - abstract_cmaui_1 - - network.outpoing.packets_cmaui_cmaui_port_4 binding_server_cmaui_4_test_nested4Level_test_nested3Level: - test_nested3Level - binding_server_cmaui_4_test_nested4Level - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - network.incoming.bytes.rate_cmaui_port_7_test_nested4Level memory.resident_server_cmaui_2: - abstract_cmaui_1 - memory.resident_cmaui - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.device.write.requests.rate_server_cmaui_4_test_nested4Level - binding_cmaui_port_8_test_nested4Level_test_nested3Level: - - test_nested3Level - - binding_cmaui_port_8_test_nested4Level - disk.write.bytes_server_cmaui_4_test_nested4Level_test_nested3Level: - - test_nested3Level - - disk.write.bytes_server_cmaui_4_test_nested4Level disk.device.read.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.device.read.requests_server_cmaui_3 @@ -709,18 +736,9 @@ topology_template: disk.ephemeral.size_server_cmaui_3_test_nested3Level: - test_nested3Level - disk.ephemeral.size_server_cmaui_3 - network.outgoing.packets.rate_cmaui_port_5_test_nested3Level: - - test_nested3Level - - network.outgoing.packets.rate_cmaui_port_5 - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level_test_nested3Level: + forwarder_cmaui_port_5_test_nested3Level: - test_nested3Level - - disk.device.read.requests.rate_server_cmaui_4_test_nested4Level - disk.device.read.bytes_server_cmaui_3_test_nested3Level: - - test_nested3Level - - disk.device.read.bytes_server_cmaui_3 - memory.resident_server_cmaui_3_test_nested3Level: - - test_nested3Level - - memory.resident_server_cmaui_3 + - forwarder_cmaui_port_5 memory.usage_server_cmaui_2: - abstract_cmaui_1 - memory.usage_cmaui @@ -784,4 +802,4 @@ topology_template: - dependency_cmaui_cmaui_port_3 dependency_cmaui_port_5_test_nested3Level: - test_nested3Level - - dependency_cmaui_port_5
\ No newline at end of file + - dependency_cmaui_port_5 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index d8eca3f7f0..a68045fcea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -176,9 +176,15 @@ topology_template: disk.device.latency_server_cmaui_3: - abstract_cmaui - disk.device.latency_cmaui + forwarder_cmaui_port_7_test_nested4Level: + - test_nested4Level + - forwarder_cmaui_port_7 disk.read.requests_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.read.requests_server_cmaui_4 + forwarder_cmaui_port_8_test_nested4Level: + - test_nested4Level + - forwarder_cmaui_port_8 disk.root.size_server_cmaui_3: - abstract_cmaui - disk.root.size_cmaui @@ -458,12 +464,18 @@ topology_template: disk.device.latency_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.latency_server_cmaui_4 + forwarder_cmaui_port_6: + - abstract_cmaui + - forwarder_cmaui_cmaui_port_6 disk.device.read.requests.rate_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.device.read.requests.rate_server_cmaui_4 disk.ephemeral.size_server_cmaui_4_test_nested4Level: - test_nested4Level - disk.ephemeral.size_server_cmaui_4 + forwarder_cmaui_port_5: + - abstract_cmaui + - forwarder_cmaui_cmaui_port_5 disk.device.allocation_server_cmaui_3: - abstract_cmaui - disk.device.allocation_cmaui @@ -584,4 +596,4 @@ topology_template: - dependency_cmaui dependency_cmaui_port_5: - abstract_cmaui - - dependency_cmaui_cmaui_port_5
\ No newline at end of file + - dependency_cmaui_cmaui_port_5 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml index 1d43dd817b..257d8c7722 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml @@ -297,6 +297,12 @@ topology_template: disk.device.allocation_server_cmaui_4: - server_cmaui_4 - disk.device.allocation + forwarder_cmaui_port_8: + - cmaui_port_8 + - forwarder + forwarder_cmaui_port_7: + - cmaui_port_7 + - forwarder disk.write.requests.rate_server_cmaui_4: - server_cmaui_4 - disk.write.requests.rate @@ -417,4 +423,4 @@ topology_template: - dependency local_storage_server_cmaui_4: - server_cmaui_4 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 90dfb74a67..938583febf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -292,6 +292,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1007,6 +1017,16 @@ node_types: 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.read.bytes.rate_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. @@ -1430,6 +1450,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_oam_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2145,6 +2175,16 @@ node_types: 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.read.bytes.rate_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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml index 1ea3bef5af..37a35b6a53 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -293,6 +293,12 @@ topology_template: network.outgoing.bytes.rate_oam_port_1: - oam_port_1 - network.outgoing.bytes.rate + forwarder_oam_port_0: + - oam_port_0 + - forwarder + forwarder_oam_port_1: + - oam_port_1 + - forwarder disk.device.usage_server_oam: - server_oam - disk.device.usage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml index c858e3ec56..ed7bb6c11e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/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/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -369,6 +369,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2a56194be9..19bf6af97c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -443,6 +443,16 @@ node_types: 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.read.bytes.rate_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. @@ -1091,6 +1101,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 disk.latency_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1576,6 +1596,16 @@ node_types: 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.read.bytes.rate_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. @@ -2016,4 +2046,4 @@ node_types: type: tosca.capabilities.network.Bindable 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/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 5abcd8ca3b..bb22e48d0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -402,6 +402,12 @@ topology_template: disk.device.capacity_server_oam: - server_oam - disk.device.capacity + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder disk.latency_server_oam: - server_oam - disk.latency @@ -444,4 +450,4 @@ topology_template: - link dependency_server_oam: - server_oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/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/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index bd196677ef..4ae500bb53 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/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/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -376,6 +376,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index cf58502a77..7a2181b31f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -438,6 +438,16 @@ node_types: 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.read.bytes.rate_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. @@ -1086,6 +1096,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 disk.latency_server_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1566,6 +1586,16 @@ node_types: 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.read.bytes.rate_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. @@ -1994,4 +2024,4 @@ node_types: type: tosca.capabilities.network.Bindable 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 5abcd8ca3b..bb22e48d0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -402,6 +402,12 @@ topology_template: disk.device.capacity_server_oam: - server_oam - disk.device.capacity + forwarder_pcm_port_00: + - pcm_port_00 + - forwarder + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder disk.latency_server_oam: - server_oam - disk.latency @@ -444,4 +450,4 @@ topology_template: - link dependency_server_oam: - server_oam - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 63ed0d5319..00424ac7af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -370,6 +370,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 16dda32915..8e4a86e326 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -428,6 +428,16 @@ node_types: 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.read.bytes.rate_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. @@ -802,6 +812,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_compute_compute_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_compute_compute_port: 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/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index fc08135089..e067cb55ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -207,6 +207,9 @@ topology_template: disk.device.usage_compute: - compute - disk.device.usage + forwarder_compute_compute_port: + - compute_compute_port + - forwarder network.incoming.packets_compute_compute_port: - compute_compute_port - network.incoming.packets diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml index d999e227be..f9522f3c5c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -358,6 +358,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 060e2ed852..ca53e2c90c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -287,6 +287,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_2port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_pcm_2port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -364,6 +369,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_1port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml index ce637db1de..866ceacfb4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -286,6 +286,9 @@ topology_template: disk.allocation_server_pcm: - server_pcm - disk.allocation + forwarder_pcm_2port_1: + - pcm_2port_1 + - forwarder network.incoming.packets_pcm_2port_1: - pcm_2port_1 - network.incoming.packets @@ -325,6 +328,9 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes + forwarder_pcm_1port_0: + - pcm_1port_0 + - forwarder disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 181027f032..ea59bc8bfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -296,6 +296,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_pcm_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1045,6 +1050,16 @@ node_types: 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.device.write.requests.rate_server_pcm_2: 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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 25680dacf9..4252b6221d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -232,6 +232,9 @@ topology_template: network.incoming.packets_pcm_server_pcm_port: - pcm_server_pcm_port - network.incoming.packets + forwarder_pcm_server_pcm_port: + - pcm_server_pcm_port + - forwarder disk.device.usage_pcm_server: - pcm_server - disk.device.usage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index 2a3be24233..bb6490a5ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -430,6 +430,12 @@ topology_template: cpu.delta_server_pcm_2: - abstract_pcm_server_0 - cpu.delta_pcm_server + forwarder_pcm_port_0: + - abstract_pcm_server_1 + - forwarder_pcm_server_pcm_port + forwarder_pcm_port_1: + - abstract_pcm_server_0 + - forwarder_pcm_server_pcm_port disk.device.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests.rate_pcm_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index fb024af4d2..84d7863050 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -131,6 +131,11 @@ node_types: - 1 - 1 capabilities: + forwarder_pd_server_pcm_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -729,6 +734,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_pcm_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1482,6 +1492,16 @@ node_types: 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 memory.resident_server_pd_0: 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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 25680dacf9..4252b6221d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -232,6 +232,9 @@ topology_template: network.incoming.packets_pcm_server_pcm_port: - pcm_server_pcm_port - network.incoming.packets + forwarder_pcm_server_pcm_port: + - pcm_server_pcm_port + - forwarder disk.device.usage_pcm_server: - pcm_server - disk.device.usage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index a24126f7b2..8d5b37f4cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -148,6 +148,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + forwarder_pd_server_pcm_port: + - pd_server_pcm_port + - forwarder scalable_pd_server: - pd_server - scalable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index a2031c2812..8e26dac997 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -442,6 +442,12 @@ topology_template: cpu.delta_server_pcm_0: - abstract_pcm_server - cpu.delta_pcm_server + forwarder_pcm_port_0: + - abstract_pcm_server + - forwarder_pcm_server_pcm_port + forwarder_pcm_port_1: + - abstract_pd_server + - forwarder_pd_server_pcm_port memory.resident_server_pd_0: - abstract_pd_server - memory.resident_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2ebfbde147..eeb29c1c14 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -410,6 +410,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_11: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -506,6 +511,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -969,6 +979,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_12: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1059,6 +1074,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_02: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1546,6 +1566,16 @@ node_types: 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.read.bytes.rate_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. @@ -1681,4 +1711,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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 8f2e3460e3..38642e8085 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -358,6 +358,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 57edbcf4aa..cb42268375 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -349,6 +349,9 @@ topology_template: disk.device.capacity_server_pcm_1: - server_pcm_1 - disk.device.capacity + forwarder_pcm_port_11: + - pcm_port_11 + - forwarder disk.read.requests_server_pcm_1: - server_pcm_1 - disk.read.requests @@ -397,6 +400,9 @@ topology_template: disk.device.write.requests_server_pcm_1: - server_pcm_1 - disk.device.write.requests + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder disk.write.bytes_server_pcm_1: - server_pcm_1 - disk.write.bytes @@ -445,4 +451,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml index a938a898f4..e4e97f1d85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml @@ -349,6 +349,9 @@ topology_template: cpu.delta_server_pcm_2: - server_pcm_2 - cpu.delta + forwarder_pcm_port_12: + - pcm_port_12 + - forwarder disk.device.write.requests.rate_server_pcm_2: - server_pcm_2 - disk.device.write.requests.rate @@ -394,6 +397,9 @@ topology_template: disk.device.usage_server_pcm_2: - server_pcm_2 - disk.device.usage + forwarder_pcm_port_02: + - pcm_port_02 + - forwarder disk.device.write.requests_server_pcm_2: - server_pcm_2 - disk.device.write.requests @@ -445,4 +451,4 @@ topology_template: - link local_storage_server_pcm_2: - server_pcm_2 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0c714840ed..f902040da6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -410,6 +410,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_11: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -506,6 +511,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -987,6 +997,16 @@ node_types: 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.read.bytes.rate_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. @@ -1528,6 +1548,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_11: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1624,6 +1649,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_port_01: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1681,4 +1711,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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml index 1e198d3bda..31241fa35d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -349,6 +349,9 @@ topology_template: disk.device.capacity_server_pcm_1: - server_pcm_1 - disk.device.capacity + forwarder_pcm_port_11: + - pcm_port_11 + - forwarder disk.read.requests_server_pcm_1: - server_pcm_1 - disk.read.requests @@ -397,6 +400,9 @@ topology_template: disk.device.write.requests_server_pcm_1: - server_pcm_1 - disk.device.write.requests + forwarder_pcm_port_01: + - pcm_port_01 + - forwarder disk.write.bytes_server_pcm_1: - server_pcm_1 - disk.write.bytes @@ -445,4 +451,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml index 95920310e1..7e16cca168 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -358,6 +358,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - 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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 92ea0fa5e7..c5748afcc2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -428,6 +428,16 @@ node_types: 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.read.bytes.rate_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. @@ -987,6 +997,16 @@ node_types: 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.read.bytes.rate_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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index d999e227be..f9522f3c5c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -358,6 +358,12 @@ topology_template: disk.iops_server_pcm: - server_pcm - disk.iops + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder disk.read.bytes.rate_server_pcm: - server_pcm - disk.read.bytes.rate |