diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested')
23 files changed, 3650 insertions, 3670 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index f8f5764af2..0c8f667dce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -81,14 +81,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_server_pcm_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: + - local_storage_server_pcm_2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -115,31 +115,25 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_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. - occurrences: - - 1 - - UNBOUNDED network.incoming.packets.rate_pcm_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.outpoing.packets_pcm_port_1: + disk.root.size_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. occurrences: - 1 - UNBOUNDED - memory_server_pcm: + network.outpoing.packets_pcm_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_server_pcm: + disk.iops_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. occurrences: @@ -151,73 +145,61 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pcm: + disk.device.write.bytes.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. occurrences: - 1 - UNBOUNDED - memory.resident_server_pcm: + disk.usage_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + disk.capacity_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. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm: + disk.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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + disk.read.bytes_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. occurrences: - 1 - UNBOUNDED - disk.usage_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. - occurrences: - - 1 - - UNBOUNDED - disk.device.write.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. - occurrences: - - 1 - - UNBOUNDED - disk.root.size_server_pcm: + network.incoming.bytes_pcm_port_0: type: org.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_pcm: + network.incoming.bytes_pcm_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.latency_server_pcm: + cpu_util_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + vcpus_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + memory.resident_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. occurrences: @@ -237,42 +219,42 @@ node_types: occurrences: - 0 - UNBOUNDED - memory.usage_server_pcm: + cpu_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. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pcm: + network.outgoing.packets.rate_pcm_port_0: type: org.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_pcm: + network.outgoing.packets.rate_pcm_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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + feature_server_pcm_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: + disk.device.write.bytes_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + disk.device.iops_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_1: + disk.allocation_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. occurrences: @@ -289,12 +271,6 @@ node_types: 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. - occurrences: - - 1 - - UNBOUNDED feature_pcm_port_0: type: tosca.capabilities.Node occurrences: @@ -316,84 +292,96 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + memory.usage_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. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + disk.device.read.bytes_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. occurrences: - 1 - UNBOUNDED - vcpus_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. + host_server_pcm_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + endpoint_server_pcm_2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + disk.read.bytes.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. occurrences: - 1 - UNBOUNDED - disk.iops_server_pcm: + disk.device.capacity_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pcm: + cpu.delta_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. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + disk.ephemeral.size_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. occurrences: - 1 - UNBOUNDED - cpu_util_server_pcm: + disk.latency_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. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + disk.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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + scalable_server_pcm_2: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + memory_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. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.read.bytes.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. occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + disk.device.latency_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. occurrences: @@ -405,14 +393,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_0: + disk.device.usage_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. occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + network.incoming.packets_pcm_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -422,7 +411,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + 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. occurrences: @@ -434,32 +423,32 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pcm: + disk.write.bytes_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.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. + os_server_pcm_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.latency_server_pcm: + instance_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. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_pcm: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node + disk.device.read.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. occurrences: - 1 - UNBOUNDED @@ -469,18 +458,29 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + disk.write.bytes.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. occurrences: - 1 - UNBOUNDED + binding_server_pcm_2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes.rate_pcm_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.allocation_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. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -555,414 +555,414 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_port_0: + - 1 + - 1 + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_pcm_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: - network.incoming.packets.rate_pcm_port_0: + disk.root.size_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. occurrences: - 1 - UNBOUNDED - cpu_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. + feature_pcm_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + network.incoming.packets_pcm_port_01: type: org.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_pcm_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. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_pcm: + network.incoming.packets_pcm_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pcm: + disk.iops_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. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + disk.device.write.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pcm: + network.outgoing.packets.rate_pcm_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. occurrences: - 1 - UNBOUNDED - memory.resident_server_pcm: + network.incoming.bytes_pcm_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + network.incoming.bytes_pcm_port_01: type: org.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_pcm: + disk.capacity_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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + disk.write.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. occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm: + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.device.write.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. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_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. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm: + network.outgoing.bytes_pcm_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. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm: + network.outgoing.packets.rate_pcm_port_01: type: org.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_pcm_port_0: + disk.usage_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + cpu_util_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. occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_server_pcm: + vcpus_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. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pcm: + memory.resident_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. occurrences: - 1 - UNBOUNDED - disk.capacity_server_pcm: + network.outgoing.bytes_pcm_port_01: type: org.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_pcm: - type: tosca.capabilities.OperatingSystem + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: + disk.allocation_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + disk.device.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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_1: + memory.usage_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. occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + cpu_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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pcm: + network.incoming.bytes.rate_pcm_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. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + disk.device.read.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.incoming.bytes.rate_pcm_port_01: type: org.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_pcm_port_0: - type: tosca.capabilities.Attachment + endpoint_server_pcm_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + disk.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + disk.device.iops_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. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + cpu.delta_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. occurrences: - 1 - UNBOUNDED - vcpus_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. + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + disk.device.capacity_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. occurrences: - 1 - UNBOUNDED - disk.iops_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pcm: + disk.device.write.requests.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pcm: + disk.ephemeral.size_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. occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + disk.latency_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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.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_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.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_pcm: + network.incoming.packets.rate_pcm_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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_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. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container + binding_pcm_port_00: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - cpu.delta_server_pcm: + memory_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1: + network.outgoing.bytes.rate_pcm_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_0: + disk.device.latency_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. occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + disk.device.usage_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. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_1: + 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. occurrences: - 1 - UNBOUNDED - instance_server_pcm: + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_pcm: + instance_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. occurrences: - 1 - UNBOUNDED - disk.latency_server_pcm: + disk.device.read.requests.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_pcm: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_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. occurrences: - 1 - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + network.outpoing.packets_pcm_port_01: type: org.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_pcm: + disk.write.bytes.rate_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + disk.device.allocation_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. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index f0fffa18ed..7e74985b6b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -90,7 +90,7 @@ topology_template: type: string description: OAM network name node_templates: - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -103,32 +103,19 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: oam + network_role_tag: cps network: - get_input: oam_net_name + get_input: cps_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.nodes.heat.pcm_server - properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name - pcm_port_0: + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -141,18 +128,31 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: cps + network_role_tag: oam network: - get_input: cps_net_name + get_input: oam_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo + server_pcm_1: + type: org.openecomp.resource.vfc.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name groups: nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack @@ -160,221 +160,221 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - - server_pcm - - pcm_port_0 + - pcm_port_00 + - pcm_port_01 + - server_pcm_1 outputs: server_pcm_id: description: the pcm nova service id - value: server_pcm + value: server_pcm_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate - cpu_server_pcm: - - server_pcm - - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets - memory_server_pcm: - - server_pcm - - memory - disk.write.requests_server_pcm: - - server_pcm - - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets - disk.device.iops_server_pcm: - - server_pcm - - disk.device.iops - memory.resident_server_pcm: - - server_pcm - - memory.resident - disk.device.write.requests_server_pcm: - - server_pcm - - disk.device.write.requests - disk.device.usage_server_pcm: - - server_pcm - - disk.device.usage - disk.allocation_server_pcm: - - server_pcm - - disk.allocation - disk.usage_server_pcm: - - server_pcm - - disk.usage - disk.device.write.bytes_server_pcm: - - server_pcm - - disk.device.write.bytes - disk.root.size_server_pcm: - - server_pcm + disk.root.size_server_pcm_1: + - server_pcm_1 - disk.root.size - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 + feature_pcm_port_00: + - pcm_port_00 + - feature + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets + disk.iops_server_pcm_1: + - server_pcm_1 + - disk.iops + disk.device.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes.rate + network.outgoing.packets.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.packets.rate + network.incoming.bytes_pcm_port_00: + - pcm_port_00 - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 + network.incoming.bytes_pcm_port_01: + - pcm_port_01 - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding - memory.usage_server_pcm: - - server_pcm - - memory.usage - disk.read.requests_server_pcm: - - server_pcm - - disk.read.requests - disk.capacity_server_pcm: - - server_pcm + disk.capacity_server_pcm_1: + - server_pcm_1 - disk.capacity - os_server_pcm: - - server_pcm - - os - disk.read.bytes_server_pcm: - - server_pcm + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + disk.read.bytes_server_pcm_1: + - server_pcm_1 - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 + attachment_pcm_port_00: + - pcm_port_00 + - attachment + attachment_pcm_port_01: + - pcm_port_01 + - attachment + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 + disk.usage_server_pcm_1: + - server_pcm_1 + - disk.usage + cpu_util_server_pcm_1: + - server_pcm_1 + - cpu_util + vcpus_server_pcm_1: + - server_pcm_1 + - vcpus + memory.resident_server_pcm_1: + - server_pcm_1 + - memory.resident + network.outgoing.bytes_pcm_port_01: + - pcm_port_01 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 + feature_server_pcm_1: + - server_pcm_1 - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment - endpoint_server_pcm: - - server_pcm + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage + cpu_server_pcm_1: + - server_pcm_1 + - cpu + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate + endpoint_server_pcm_1: + - server_pcm_1 - endpoint - disk.device.read.requests.rate_server_pcm: - - server_pcm - - disk.device.read.requests.rate - vcpus_server_pcm: - - server_pcm - - vcpus - disk.write.bytes_server_pcm: - - server_pcm - - disk.write.bytes - disk.iops_server_pcm: - - server_pcm - - disk.iops - disk.read.bytes.rate_server_pcm: - - server_pcm + disk.read.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.read.bytes.rate - disk.device.allocation_server_pcm: - - server_pcm - - disk.device.allocation - scalable_server_pcm: - - server_pcm - - scalable - disk.device.read.bytes.rate_server_pcm: - - server_pcm - - disk.device.read.bytes.rate - cpu_util_server_pcm: - - server_pcm - - cpu_util - disk.write.requests.rate_server_pcm: - - server_pcm - - disk.write.requests.rate - disk.device.write.bytes.rate_server_pcm: - - server_pcm - - disk.device.write.bytes.rate - host_server_pcm: - - server_pcm - - host - cpu.delta_server_pcm: - - server_pcm + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops + cpu.delta_server_pcm_1: + - server_pcm_1 - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets - binding_server_pcm: - - server_pcm - - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate - disk.device.capacity_server_pcm: - - server_pcm + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets - instance_server_pcm: - - server_pcm - - instance - disk.device.write.requests.rate_server_pcm: - - server_pcm + disk.read.requests_server_pcm_1: + - server_pcm_1 + - disk.read.requests + disk.device.write.requests.rate_server_pcm_1: + - server_pcm_1 - disk.device.write.requests.rate - disk.latency_server_pcm: - - server_pcm + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size + disk.latency_server_pcm_1: + - server_pcm_1 - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm + network.outgoing.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.packets.rate + network.incoming.packets.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.packets.rate + binding_pcm_port_01: + - pcm_port_01 + - binding + scalable_server_pcm_1: + - server_pcm_1 + - scalable + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.write.requests.rate + binding_pcm_port_00: + - pcm_port_00 + - binding + memory_server_pcm_1: + - server_pcm_1 + - memory + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes.rate + disk.device.latency_server_pcm_1: + - server_pcm_1 + - disk.device.latency + disk.device.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes.rate + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests + disk.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.write.bytes + disk.device.read.requests_server_pcm_1: + - server_pcm_1 - disk.device.read.requests - feature_server_pcm: - - server_pcm - - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate + os_server_pcm_1: + - server_pcm_1 + - os + network.outpoing.packets_pcm_port_00: + - pcm_port_00 + - network.outpoing.packets + binding_server_pcm_1: + - server_pcm_1 + - binding + network.outpoing.packets_pcm_port_01: + - pcm_port_01 + - network.outpoing.packets + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link - local_storage_server_pcm: - - server_pcm - - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_00: + - pcm_port_00 + - dependency + dependency_pcm_port_01: + - pcm_port_01 - dependency - dependency_server_pcm: - - server_pcm + dependency_server_pcm_1: + - server_pcm_1 - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency
\ No newline at end of file + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_00: + - pcm_port_00 + - link + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 8aa225dbdc..b373c12e48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -99,9 +99,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_2 relationship: tosca.relationships.network.BindsTo - server_pcm: + server_pcm_2: type: org.openecomp.resource.vfc.nodes.heat.pcm_server properties: flavor: @@ -137,7 +137,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_2 relationship: tosca.relationships.network.BindsTo groups: nested-pcm_v0.1_2_group: @@ -147,108 +147,96 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - pcm_port_1 - - server_pcm + - server_pcm_2 - pcm_port_0 outputs: server_pcm_id: description: the pcm nova service id - value: server_pcm + value: server_pcm_2 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 capabilities: network.incoming.packets.rate_pcm_port_0: - pcm_port_0 - network.incoming.packets.rate - cpu_server_pcm: - - server_pcm - - cpu network.incoming.packets.rate_pcm_port_1: - pcm_port_1 - network.incoming.packets.rate + disk.root.size_server_pcm_2: + - server_pcm_2 + - disk.root.size network.outpoing.packets_pcm_port_1: - pcm_port_1 - network.outpoing.packets - memory_server_pcm: - - server_pcm - - memory - disk.write.requests_server_pcm: - - server_pcm - - disk.write.requests + disk.iops_server_pcm_2: + - server_pcm_2 + - disk.iops network.outpoing.packets_pcm_port_0: - pcm_port_0 - network.outpoing.packets - disk.device.iops_server_pcm: - - server_pcm - - disk.device.iops - memory.resident_server_pcm: - - server_pcm - - memory.resident - disk.device.write.requests_server_pcm: - - server_pcm - - disk.device.write.requests - disk.device.usage_server_pcm: - - server_pcm - - disk.device.usage - disk.allocation_server_pcm: - - server_pcm - - disk.allocation - disk.usage_server_pcm: - - server_pcm + disk.device.write.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.device.write.bytes.rate + disk.usage_server_pcm_2: + - server_pcm_2 - disk.usage - disk.device.write.bytes_server_pcm: - - server_pcm - - disk.device.write.bytes - disk.root.size_server_pcm: - - server_pcm - - disk.root.size - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency + disk.capacity_server_pcm_2: + - server_pcm_2 + - disk.capacity + disk.write.requests_server_pcm_2: + - server_pcm_2 + - disk.write.requests + disk.read.bytes_server_pcm_2: + - server_pcm_2 + - disk.read.bytes network.incoming.bytes_pcm_port_0: - pcm_port_0 - network.incoming.bytes network.incoming.bytes_pcm_port_1: - pcm_port_1 - network.incoming.bytes + cpu_util_server_pcm_2: + - server_pcm_2 + - cpu_util + vcpus_server_pcm_2: + - server_pcm_2 + - vcpus + memory.resident_server_pcm_2: + - server_pcm_2 + - memory.resident binding_pcm_port_0: - pcm_port_0 - binding binding_pcm_port_1: - pcm_port_1 - binding - memory.usage_server_pcm: - - server_pcm - - memory.usage - disk.read.requests_server_pcm: - - server_pcm - - disk.read.requests - disk.capacity_server_pcm: - - server_pcm - - disk.capacity - os_server_pcm: - - server_pcm - - os - disk.read.bytes_server_pcm: - - server_pcm - - disk.read.bytes + cpu_server_pcm_2: + - server_pcm_2 + - cpu network.outgoing.packets.rate_pcm_port_0: - pcm_port_0 - network.outgoing.packets.rate network.outgoing.packets.rate_pcm_port_1: - pcm_port_1 - network.outgoing.packets.rate + feature_server_pcm_2: + - server_pcm_2 + - feature + disk.device.write.bytes_server_pcm_2: + - server_pcm_2 + - disk.device.write.bytes + disk.device.iops_server_pcm_2: + - server_pcm_2 + - disk.device.iops + disk.allocation_server_pcm_2: + - server_pcm_2 + - disk.allocation feature_pcm_port_1: - pcm_port_1 - feature network.outgoing.bytes_pcm_port_0: - pcm_port_0 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes feature_pcm_port_0: - pcm_port_0 - feature @@ -261,90 +249,102 @@ topology_template: attachment_pcm_port_1: - pcm_port_1 - attachment - endpoint_server_pcm: - - server_pcm + memory.usage_server_pcm_2: + - server_pcm_2 + - memory.usage + disk.device.read.bytes_server_pcm_2: + - server_pcm_2 + - disk.device.read.bytes + host_server_pcm_2: + - server_pcm_2 + - host + endpoint_server_pcm_2: + - server_pcm_2 - endpoint - disk.device.read.requests.rate_server_pcm: - - server_pcm - - disk.device.read.requests.rate - vcpus_server_pcm: - - server_pcm - - vcpus - disk.write.bytes_server_pcm: - - server_pcm - - disk.write.bytes - disk.iops_server_pcm: - - server_pcm - - disk.iops - disk.read.bytes.rate_server_pcm: - - server_pcm + disk.read.bytes.rate_server_pcm_2: + - server_pcm_2 - disk.read.bytes.rate - disk.device.allocation_server_pcm: - - server_pcm - - disk.device.allocation - scalable_server_pcm: - - server_pcm + disk.device.capacity_server_pcm_2: + - server_pcm_2 + - disk.device.capacity + cpu.delta_server_pcm_2: + - server_pcm_2 + - cpu.delta + disk.device.write.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.device.write.requests.rate + disk.read.requests_server_pcm_2: + - server_pcm_2 + - disk.read.requests + disk.ephemeral.size_server_pcm_2: + - server_pcm_2 + - disk.ephemeral.size + disk.latency_server_pcm_2: + - server_pcm_2 + - disk.latency + disk.write.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.write.requests.rate + scalable_server_pcm_2: + - server_pcm_2 - scalable - disk.device.read.bytes.rate_server_pcm: - - server_pcm + memory_server_pcm_2: + - server_pcm_2 + - memory + disk.device.read.bytes.rate_server_pcm_2: + - server_pcm_2 - disk.device.read.bytes.rate - cpu_util_server_pcm: - - server_pcm - - cpu_util - disk.write.requests.rate_server_pcm: - - server_pcm - - disk.write.requests.rate - disk.device.write.bytes.rate_server_pcm: - - server_pcm - - disk.device.write.bytes.rate - host_server_pcm: - - server_pcm - - host - cpu.delta_server_pcm: - - server_pcm - - cpu.delta + disk.device.latency_server_pcm_2: + - server_pcm_2 + - disk.device.latency network.outgoing.bytes.rate_pcm_port_1: - pcm_port_1 - network.outgoing.bytes.rate + disk.device.usage_server_pcm_2: + - server_pcm_2 + - disk.device.usage network.incoming.packets_pcm_port_0: - pcm_port_0 - network.incoming.packets - binding_server_pcm: - - server_pcm - - binding network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - network.outgoing.bytes.rate - disk.device.capacity_server_pcm: - - server_pcm - - disk.device.capacity + disk.device.write.requests_server_pcm_2: + - server_pcm_2 + - disk.device.write.requests network.incoming.packets_pcm_port_1: - pcm_port_1 - network.incoming.packets - instance_server_pcm: - - server_pcm + disk.write.bytes_server_pcm_2: + - server_pcm_2 + - disk.write.bytes + os_server_pcm_2: + - server_pcm_2 + - os + instance_server_pcm_2: + - server_pcm_2 - instance - disk.device.write.requests.rate_server_pcm: - - server_pcm - - disk.device.write.requests.rate - disk.latency_server_pcm: - - server_pcm - - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm + disk.device.read.requests_server_pcm_2: + - server_pcm_2 - disk.device.read.requests - feature_server_pcm: - - server_pcm - - feature + disk.device.read.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.device.read.requests.rate network.incoming.bytes.rate_pcm_port_0: - pcm_port_0 - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + disk.write.bytes.rate_server_pcm_2: + - server_pcm_2 - disk.write.bytes.rate + binding_server_pcm_2: + - server_pcm_2 + - binding network.incoming.bytes.rate_pcm_port_1: - pcm_port_1 - network.incoming.bytes.rate + disk.device.allocation_server_pcm_2: + - server_pcm_2 + - disk.device.allocation requirements: link_pcm_port_0: - pcm_port_0 @@ -352,15 +352,15 @@ topology_template: link_pcm_port_1: - pcm_port_1 - link - local_storage_server_pcm: - - server_pcm - - local_storage + dependency_server_pcm_2: + - server_pcm_2 + - dependency dependency_pcm_port_0: - pcm_port_0 - dependency - dependency_server_pcm: - - server_pcm - - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency + local_storage_server_pcm_2: + - server_pcm_2 + - local_storage
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml index 109bf86d24..476953750e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml @@ -68,7 +68,7 @@ resources: - config: { get_resource: network} - config: { get_resource: script_init} - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -77,8 +77,8 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_port_00} + - port: { get_resource: pcm_port_01} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -86,7 +86,7 @@ resources: user_data: get_resource: server_init - pcm_port_0: + pcm_port_00: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -94,21 +94,14 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } fixed_ips: - ip_address: { get_param: oam_net_ip } security_groups: [{ get_param: security_group_name }] - - #pcm_vol_attachment: - # type: OS:: Cinder::VolumeAttachment - # properties: - # volume_id: { get_param: pcm_vol } - # mountpoint: /dev/vdb - # instance_uuid: { get_resource: server_pcm } outputs: server_pcm_id: description: the pcm nova service id - value: { get_resource: server_pcm }
\ No newline at end of file + value: { get_resource: server_pcm_1 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml index 3f117a8410..fe545e9f1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml @@ -74,7 +74,7 @@ resources: - config: { get_resource: network} - config: { get_resource: script_init} - server_pcm: + server_pcm_2: type: OS::Nova::Server properties: config_drive: "True" @@ -107,14 +107,7 @@ resources: fixed_ips: - ip_address: { get_param: oam_net_ip } security_groups: [{ get_param: security_group_name }] - - #pcm_vol_attachment: - # type: OS:: Cinder::VolumeAttachment - # properties: - # volume_id: { get_param: pcm_vol } - # mountpoint: /dev/vdb - # instance_uuid: { get_resource: server_pcm } outputs: server_pcm_id: description: the pcm nova service id - value: { get_resource: server_pcm }
\ No newline at end of file + value: { get_resource: server_pcm_2 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index f2dee5053a..59633bad64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,67 +68,67 @@ node_types: occurrences: - 1 - 1 - - dependency_test_nested2: + - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_11_test_nested2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + - local_storage_server_cmaui_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11_test_nested2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_cmaui_port_22_test_nested2: + - dependency_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22_test_nested2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_server_cmaui_test_nested2: + - dependency_server_cmaui_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested2: + - local_storage_server_cmaui_2_test_nested2: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - dependency_server_cmaui: + - dependency_cmaui_port_11_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_11_test_nested2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_cmaui_port_22_test_nested2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - link_cmaui_port_22_test_nested2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_cmaui_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -143,144 +143,163 @@ node_types: - 1 - 1 capabilities: - cpu.delta_server_cmaui: + network.incoming.packets.rate_cmaui_port_22_test_nested2: type: org.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: + disk.device.usage_server_cmaui_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_cmaui_port_22_test_nested2: + disk.device.latency_server_cmaui_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.allocation_server_cmaui: + disk.device.usage_server_cmaui_2_test_nested2: type: org.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_test_nested2: + host_server_cmaui_2_test_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.device.write.bytes.rate_server_cmaui_2_test_nested2: type: org.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: - type: tosca.capabilities.Scalable + disk.root.size_server_cmaui_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.rate_server_cmaui: + disk.device.write.requests.rate_server_cmaui_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_server_cmaui_test_nested2: + binding_cmaui_port_11_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.iops_server_cmaui_2_test_nested2: type: org.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: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.outgoing.bytes_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. occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui: + disk.read.requests_server_cmaui_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 - binding_cmaui_port_11_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.bytes_cmaui_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: - - 0 + - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested2: - type: tosca.capabilities.Endpoint.Admin + disk.device.iops_server_cmaui_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_server_cmaui_test_nested2: + disk.allocation_server_cmaui_2_test_nested2: type: org.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: + disk.device.read.bytes.rate_server_cmaui_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_cmaui_port_2: + network.incoming.packets.rate_cmaui_port_11_test_nested2: type: org.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_1: + disk.read.bytes_server_cmaui_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 - memory.usage_server_cmaui_test_nested2: + disk.device.read.bytes_server_cmaui_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_cmaui_port_11_test_nested2: + cpu_server_cmaui_2_test_nested2: type: org.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: + disk.device.read.bytes.rate_server_cmaui_2_test_nested2: type: org.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: + disk.device.read.bytes_server_cmaui_2_test_nested2: type: org.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: + disk.write.requests.rate_server_cmaui_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 + endpoint_server_cmaui_2_test_nested2: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED binding_cmaui_port_22_test_nested2: type: tosca.capabilities.network.Bindable valid_source_types: @@ -288,29 +307,37 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested2: - type: tosca.capabilities.network.Bindable + cpu.delta_server_cmaui_2_test_nested2: + type: org.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_2: + instance_server_cmaui_2_test_nested2: type: org.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: - type: tosca.capabilities.OperatingSystem + cpu_server_cmaui_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_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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + memory.usage_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.write.requests.rate_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -322,47 +349,71 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested2: + disk.device.write.bytes_server_cmaui_2_test_nested2: type: org.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_22_test_nested2: + disk.ephemeral.size_server_cmaui_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_server_cmaui_test_nested2: + disk.capacity_server_cmaui_2_test_nested2: type: org.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_11_test_nested2: + disk.capacity_server_cmaui_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 - os_server_cmaui_test_nested2: - type: tosca.capabilities.OperatingSystem + network.incoming.bytes.rate_cmaui_port_22_test_nested2: + type: org.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_22_test_nested2: - type: tosca.capabilities.Node + disk.latency_server_cmaui_2_test_nested2: + type: org.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_test_nested2: + disk.read.bytes.rate_server_cmaui_2_test_nested2: type: org.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: + network.outpoing.packets_cmaui_port_11_test_nested2: + type: org.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_test_nested2: + type: org.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_test_nested2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_2_test_nested2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_22_test_nested2: type: tosca.capabilities.Node occurrences: - 1 @@ -381,25 +432,25 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested2: + disk.ephemeral.size_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.iops_server_cmaui_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 - memory.usage_server_cmaui: + vcpus_server_cmaui_2_test_nested2: type: org.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: + disk.device.write.requests_server_cmaui_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: @@ -411,13 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_test_nested2: + disk.device.write.bytes.rate_server_cmaui_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 - memory.resident_server_cmaui_test_nested2: + cpu_util_server_cmaui_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: @@ -441,50 +492,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - host_server_cmaui_test_nested2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - disk.usage_server_cmaui_test_nested2: - type: org.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: - type: org.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_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.read.bytes_server_cmaui: + network.incoming.bytes_cmaui_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_cmaui_port_1: + disk.write.bytes.rate_server_cmaui_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.ephemeral.size_server_cmaui_test_nested2: + disk.device.write.bytes_server_cmaui_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: @@ -502,12 +528,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested2: - type: org.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_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -520,12 +540,6 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_cmaui_port_1: type: tosca.capabilities.Node occurrences: @@ -536,146 +550,136 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + disk.write.bytes_server_cmaui_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_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested2: + disk.allocation_server_cmaui_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_cmaui_port_11_test_nested2: + cpu_util_server_cmaui_2_test_nested2: type: org.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_2: - type: tosca.capabilities.Attachment + disk.device.iops_server_cmaui_2_test_nested2: + type: org.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_test_nested2: - type: tosca.capabilities.Scalable + binding_server_cmaui_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - feature_test_nested2: - type: tosca.capabilities.Node + scalable_server_cmaui_2_test_nested2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui: + network.incoming.bytes.rate_cmaui_port_11_test_nested2: type: org.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: - 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_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_22_test_nested2: - type: tosca.capabilities.Attachment + feature_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_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. + attachment_cmaui_port_22_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2: + network.outgoing.packets.rate_cmaui_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.allocation_server_cmaui_test_nested2: + network.outgoing.packets.rate_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested2: - 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_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + disk.write.requests_server_cmaui_2_test_nested2: type: org.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: + disk.write.requests_server_cmaui_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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - memory_server_cmaui_test_nested2: + disk.usage_server_cmaui_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.capacity_server_cmaui: + disk.read.requests_server_cmaui_2_test_nested2: type: org.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: - 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_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui_test_nested2: + disk.device.capacity_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.device.read.requests.rate_server_cmaui_2_test_nested2: type: org.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: + memory.resident_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.usage_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -687,161 +691,156 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - instance_server_cmaui_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_2_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + disk.device.write.requests.rate_server_cmaui_2_test_nested2: type: org.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_test_nested2: + memory_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.device.allocation_server_cmaui_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 - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.iops_server_cmaui_test_nested2: + memory_server_cmaui_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.requests.rate_server_cmaui: + disk.device.write.requests_server_cmaui_2_test_nested2: type: org.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_test_nested2: - type: tosca.capabilities.Node + host_server_cmaui_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + network.outgoing.packets.rate_cmaui_port_11_test_nested2: type: org.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_test_nested2: + disk.read.bytes_server_cmaui_2_test_nested2: type: org.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_test_nested2: + network.outgoing.bytes_cmaui_port_22_test_nested2: type: org.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_11_test_nested2: + disk.device.capacity_server_cmaui_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.write.requests_server_cmaui_test_nested2: + disk.device.latency_server_cmaui_2_test_nested2: type: org.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_22_test_nested2: + disk.device.allocation_server_cmaui_2_test_nested2: type: org.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: + instance_server_cmaui_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_server_cmaui: + disk.device.read.requests.rate_server_cmaui_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 - vcpus_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_22_test_nested2: type: org.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_22_test_nested2: + network.incoming.bytes.rate_cmaui_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.write.bytes_server_cmaui: + network.incoming.bytes.rate_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_1: + vcpus_server_cmaui_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_cmaui_port_2: + disk.read.bytes.rate_server_cmaui_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.root.size_server_cmaui_test_nested2: + network.outpoing.packets_cmaui_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.allocation_server_cmaui: + network.outpoing.packets_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui: + disk.device.read.requests_server_cmaui_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.outpoing.packets_cmaui_port_1: + cpu.delta_server_cmaui_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.outpoing.packets_cmaui_port_2: + disk.write.bytes_server_cmaui_2_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -859,23 +858,18 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu.delta_server_cmaui_test_nested2: + network.outpoing.packets_cmaui_port_22_test_nested2: type: org.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_22_test_nested2: + memory.resident_server_cmaui_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 - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED feature_cmaui_port_11_test_nested2: type: tosca.capabilities.Node occurrences: @@ -886,7 +880,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui_test_nested2: + disk.latency_server_cmaui_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 + memory.usage_server_cmaui_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: @@ -938,6 +938,20 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_server_cmaui_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_cmaui_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -964,34 +978,20 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED capabilities: - cpu.delta_server_cmaui: + 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 - disk.device.write.requests.rate_server_cmaui: + 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 - disk.device.allocation_server_cmaui: + 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: @@ -1016,103 +1016,94 @@ node_types: occurrences: - 0 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + 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 - cpu_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + 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.read.bytes.rate_server_cmaui: + 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 - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui: + 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.packets.rate_cmaui_port_22: + 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 - disk.device.latency_server_cmaui: + network.incoming.packets.rate_cmaui_port_22: type: org.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: + 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 - disk.read.requests_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui: + 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.usage_server_cmaui: + 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.usage_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_22: type: org.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_22: + 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 - disk.capacity_server_cmaui: + 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 - disk.write.requests.rate_server_cmaui: + 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: @@ -1124,27 +1115,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + 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 - instance_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui: + 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 - memory_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -1153,7 +1142,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui: + 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: @@ -1165,35 +1154,50 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + 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.read.requests.rate_server_cmaui: + 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 - disk.write.bytes_server_cmaui: + 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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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 + network.outgoing.bytes.rate_cmaui_port_11: + type: org.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 occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + 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 - network.outgoing.bytes.rate_cmaui_port_11: + 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: @@ -1221,13 +1225,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_22: + 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 - memory.resident_server_cmaui: + network.incoming.packets_cmaui_port_22: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1239,61 +1243,56 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui: + 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 - feature_server_cmaui: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_server_cmaui: + 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 - disk.device.write.bytes_server_cmaui: + network.outgoing.packets.rate_cmaui_port_11: type: org.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: + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - 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. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui: + 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 - network.outgoing.packets.rate_cmaui_port_11: + 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 - binding_cmaui_port_11: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_server_cmaui: + 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 - disk.ephemeral.size_server_cmaui: + 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: @@ -1310,42 +1309,43 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.bytes_cmaui_port_22: + type: org.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_22: + disk.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.iops_server_cmaui: + network.incoming.packets_cmaui_port_11: type: org.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_11: + network.incoming.bytes_cmaui_port_11: type: org.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: + 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 - network.incoming.bytes_cmaui_port_11: + 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.read.bytes_server_cmaui: + memory.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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 2f611eb33d..43b1696867 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -55,6 +55,19 @@ topology_template: type: string description: UID of OAM network node_templates: + server_cmaui_2: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + name: + get_input: + - cmaui_names + - 0 cmaui_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -81,7 +94,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo cmaui_port_22: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -108,21 +121,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 groups: nested2level_group: type: org.openecomp.groups.heat.HeatStack @@ -130,21 +130,21 @@ topology_template: heat_file: ../Artifacts/nested2level.yml description: cmaui server template for vMMSC members: + - server_cmaui_2 - cmaui_port_11 - cmaui_port_22 - - server_cmaui substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2level capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + disk.device.usage_server_cmaui_2: + - server_cmaui_2 + - disk.device.usage network.outpoing.packets_cmaui_port_11: - cmaui_port_11 - network.outpoing.packets @@ -154,99 +154,102 @@ topology_template: binding_cmaui_port_22: - cmaui_port_22 - binding - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - cpu_server_cmaui: - - server_cmaui - - cpu - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes + feature_server_cmaui_2: + - server_cmaui_2 + - feature + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + binding_server_cmaui_2: + - server_cmaui_2 + - binding + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate network.incoming.packets.rate_cmaui_port_22: - cmaui_port_22 - network.incoming.packets.rate - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests - disk.read.requests_server_cmaui: - - server_cmaui + vcpus_server_cmaui_2: + - server_cmaui_2 + - vcpus + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + disk.read.requests_server_cmaui_2: + - server_cmaui_2 - disk.read.requests - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage + disk.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests network.outgoing.bytes.rate_cmaui_port_22: - cmaui_port_22 - network.outgoing.bytes.rate - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity network.outpoing.packets_cmaui_port_22: - cmaui_port_22 - network.outpoing.packets - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui - - disk.device.read.bytes - memory_server_cmaui: - - server_cmaui - - memory + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + endpoint_server_cmaui_2: + - server_cmaui_2 + - endpoint + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes + os_server_cmaui_2: + - server_cmaui_2 + - os feature_cmaui_port_22: - cmaui_port_22 - feature - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes network.incoming.bytes.rate_cmaui_port_22: - cmaui_port_22 - network.incoming.bytes.rate - binding_server_cmaui: - - server_cmaui - - binding - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation network.outgoing.bytes.rate_cmaui_port_11: - cmaui_port_11 - network.outgoing.bytes.rate + host_server_cmaui_2: + - server_cmaui_2 + - host + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 + - disk.ephemeral.size + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity feature_cmaui_port_11: - cmaui_port_11 - feature @@ -259,79 +262,70 @@ topology_template: network.outgoing.bytes_cmaui_port_11: - cmaui_port_11 - network.outgoing.bytes + instance_server_cmaui_2: + - server_cmaui_2 + - instance network.incoming.packets_cmaui_port_22: - cmaui_port_22 - network.incoming.packets - memory.resident_server_cmaui: - - server_cmaui - - memory.resident network.incoming.bytes_cmaui_port_22: - cmaui_port_22 - network.incoming.bytes - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - feature_server_cmaui: - - server_cmaui - - feature - vcpus_server_cmaui: - - server_cmaui - - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests network.outgoing.packets.rate_cmaui_port_11: - cmaui_port_11 - network.outgoing.packets.rate binding_cmaui_port_11: - cmaui_port_11 - binding - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident attachment_cmaui_port_11: - cmaui_port_11 - attachment network.incoming.packets.rate_cmaui_port_11: - cmaui_port_11 - network.incoming.packets.rate - endpoint_server_cmaui: - - server_cmaui - - endpoint network.outgoing.bytes_cmaui_port_22: - cmaui_port_22 - network.outgoing.bytes - disk.iops_server_cmaui: - - server_cmaui - - disk.iops + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency network.incoming.packets_cmaui_port_11: - cmaui_port_11 - network.incoming.packets - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops network.incoming.bytes_cmaui_port_11: - cmaui_port_11 - network.incoming.bytes - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage requirements: - dependency_server_cmaui: - - server_cmaui - - dependency - local_storage_server_cmaui: - - server_cmaui - - local_storage link_cmaui_port_11: - cmaui_port_11 - link @@ -343,4 +337,10 @@ topology_template: - dependency dependency_cmaui_port_22: - cmaui_port_22 + - dependency + local_storage_server_cmaui_2: + - server_cmaui_2 + - local_storage + dependency_server_cmaui_2: + - server_cmaui_2 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml index bd00c83084..e3f39a1a70 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -80,20 +80,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo - test_nested2: - type: org.openecomp.resource.abstract.nodes.heat.nested2level - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested2levelServiceTemplate.yaml - p2: - get_input: p2 - shared_security_group_id1: - get_input: shared_security_group_id1 - server_cmaui: + server_cmaui_1: type: org.openecomp.resource.vfc.nodes.heat.cmaui properties: flavor: @@ -110,6 +99,17 @@ topology_template: get_input: - cmaui_names - 0 + test_nested2: + type: org.openecomp.resource.abstract.nodes.heat.nested2level + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested2levelServiceTemplate.yaml + p2: + get_input: p2 + shared_security_group_id1: + get_input: shared_security_group_id1 cmaui_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -136,7 +136,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo groups: nested_group: @@ -146,8 +146,8 @@ topology_template: description: cmaui server template for vMMSC members: - cmaui_port_2 + - server_cmaui_1 - test_nested2 - - server_cmaui - cmaui_port_1 outputs: output_attr_1: @@ -158,147 +158,171 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate network.incoming.packets.rate_cmaui_port_22_test_nested2: - test_nested2 - network.incoming.packets.rate_cmaui_port_22 - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation - disk.write.requests.rate_server_cmaui_test_nested2: + disk.device.usage_server_cmaui_1: + - server_cmaui_1 + - disk.device.usage + disk.device.latency_server_cmaui_1: + - server_cmaui_1 + - disk.device.latency + disk.device.usage_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.requests.rate_server_cmaui - disk.capacity_server_cmaui_test_nested2: + - disk.device.usage_server_cmaui_2 + host_server_cmaui_2_test_nested2: - test_nested2 - - disk.capacity_server_cmaui - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - disk.latency_server_cmaui_test_nested2: + - host_server_cmaui_2 + disk.root.size_server_cmaui_2_test_nested2: - test_nested2 - - disk.latency_server_cmaui - disk.read.bytes.rate_server_cmaui_test_nested2: + - disk.root.size_server_cmaui_2 + disk.device.write.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.read.bytes.rate_server_cmaui - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util + - disk.device.write.bytes.rate_server_cmaui_2 + disk.root.size_server_cmaui_1: + - server_cmaui_1 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests.rate binding_cmaui_port_11_test_nested2: - test_nested2 - binding_cmaui_port_11 - endpoint_server_cmaui_test_nested2: + disk.write.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - - endpoint_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested2: + - disk.write.bytes.rate_server_cmaui_2 + disk.iops_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.read.bytes_server_cmaui - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests + - disk.iops_server_cmaui_2 network.outgoing.bytes_cmaui_port_2: - cmaui_port_2 - network.outgoing.bytes + disk.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.read.requests network.outgoing.bytes_cmaui_port_1: - cmaui_port_1 - network.outgoing.bytes - memory.usage_server_cmaui_test_nested2: + disk.device.iops_server_cmaui_1: + - server_cmaui_1 + - disk.device.iops + disk.allocation_server_cmaui_2_test_nested2: - test_nested2 - - memory.usage_server_cmaui + - disk.allocation_server_cmaui_2 + disk.device.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.bytes.rate network.incoming.packets.rate_cmaui_port_11_test_nested2: - test_nested2 - network.incoming.packets.rate_cmaui_port_11 - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui + disk.read.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes + disk.device.read.bytes_server_cmaui_1: + - server_cmaui_1 - disk.device.read.bytes - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size + cpu_server_cmaui_2_test_nested2: + - test_nested2 + - cpu_server_cmaui_2 + disk.device.read.bytes.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.read.bytes.rate_server_cmaui_2 + disk.device.read.bytes_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.read.bytes_server_cmaui_2 + disk.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests.rate + endpoint_server_cmaui_2_test_nested2: + - test_nested2 + - endpoint_server_cmaui_2 binding_cmaui_port_22_test_nested2: - test_nested2 - binding_cmaui_port_22 - binding_server_cmaui_test_nested2: + cpu.delta_server_cmaui_2_test_nested2: - test_nested2 - - binding_server_cmaui + - cpu.delta_server_cmaui_2 + instance_server_cmaui_2_test_nested2: + - test_nested2 + - instance_server_cmaui_2 + cpu_server_cmaui_1: + - server_cmaui_1 + - cpu network.incoming.packets_cmaui_port_2: - cmaui_port_2 - network.incoming.packets - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate - disk.allocation_server_cmaui_test_nested2: + memory.usage_server_cmaui_2_test_nested2: + - test_nested2 + - memory.usage_server_cmaui_2 + disk.write.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.allocation_server_cmaui + - disk.write.requests.rate_server_cmaui_2 network.incoming.packets_cmaui_port_1: - cmaui_port_1 - network.incoming.packets - disk.read.requests_server_cmaui_test_nested2: + disk.device.write.bytes_server_cmaui_2_test_nested2: - test_nested2 - - disk.read.requests_server_cmaui + - disk.device.write.bytes_server_cmaui_2 + disk.ephemeral.size_server_cmaui_1: + - server_cmaui_1 + - disk.ephemeral.size + disk.capacity_server_cmaui_2_test_nested2: + - test_nested2 + - disk.capacity_server_cmaui_2 + disk.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.capacity network.incoming.bytes.rate_cmaui_port_22_test_nested2: - test_nested2 - network.incoming.bytes.rate_cmaui_port_22 - disk.write.requests_server_cmaui_test_nested2: + disk.latency_server_cmaui_2_test_nested2: + - test_nested2 + - disk.latency_server_cmaui_2 + disk.read.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.requests_server_cmaui + - disk.read.bytes.rate_server_cmaui_2 network.outpoing.packets_cmaui_port_11_test_nested2: - test_nested2 - network.outpoing.packets_cmaui_port_11 - os_server_cmaui_test_nested2: + disk.device.read.requests_server_cmaui_2_test_nested2: - test_nested2 - - os_server_cmaui + - disk.device.read.requests_server_cmaui_2 + binding_server_cmaui_2_test_nested2: + - test_nested2 + - binding_server_cmaui_2 + os_server_cmaui_2_test_nested2: + - test_nested2 + - os_server_cmaui_2 feature_cmaui_port_22_test_nested2: - test_nested2 - feature_cmaui_port_22 - cpu_util_server_cmaui_test_nested2: - - test_nested2 - - cpu_util_server_cmaui - feature_server_cmaui: - - server_cmaui - - feature binding_cmaui_port_1: - cmaui_port_1 - binding binding_cmaui_port_2: - cmaui_port_2 - binding - disk.write.bytes_server_cmaui_test_nested2: + disk.ephemeral.size_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.bytes_server_cmaui - vcpus_server_cmaui_test_nested2: + - disk.ephemeral.size_server_cmaui_2 + disk.iops_server_cmaui_1: + - server_cmaui_1 + - disk.iops + vcpus_server_cmaui_2_test_nested2: - test_nested2 - - vcpus_server_cmaui - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size + - vcpus_server_cmaui_2 + disk.device.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests network.outgoing.bytes.rate_cmaui_port_2: - cmaui_port_2 - network.outgoing.bytes.rate - cpu_server_cmaui_test_nested2: - - test_nested2 - - cpu_server_cmaui - memory.resident_server_cmaui_test_nested2: - - test_nested2 - - memory.resident_server_cmaui + disk.device.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes.rate + cpu_util_server_cmaui_1: + - server_cmaui_1 + - cpu_util network.outgoing.packets.rate_cmaui_port_22_test_nested2: - test_nested2 - network.outgoing.packets.rate_cmaui_port_22 @@ -308,247 +332,217 @@ topology_template: network.outgoing.bytes.rate_cmaui_port_11_test_nested2: - test_nested2 - network.outgoing.bytes.rate_cmaui_port_11 - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - host_server_cmaui_test_nested2: - - test_nested2 - - host_server_cmaui - disk.usage_server_cmaui_test_nested2: - - test_nested2 - - disk.usage_server_cmaui - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops network.incoming.bytes_cmaui_port_2: - cmaui_port_2 - network.incoming.bytes - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes network.incoming.bytes_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes - disk.ephemeral.size_server_cmaui_test_nested2: - - test_nested2 - - disk.ephemeral.size_server_cmaui + disk.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes network.incoming.packets_cmaui_port_11_test_nested2: - test_nested2 - network.incoming.packets_cmaui_port_11 network.incoming.bytes_cmaui_port_11_test_nested2: - test_nested2 - network.incoming.bytes_cmaui_port_11 - disk.device.read.requests.rate_server_cmaui_test_nested2: - - test_nested2 - - disk.device.read.requests.rate_server_cmaui network.incoming.packets.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.packets.rate network.incoming.packets.rate_cmaui_port_2: - cmaui_port_2 - network.incoming.packets.rate - cpu_server_cmaui: - - server_cmaui - - cpu feature_cmaui_port_1: - cmaui_port_1 - feature feature_cmaui_port_2: - cmaui_port_2 - feature - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - disk.device.write.bytes_server_cmaui_test_nested2: + disk.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes + feature_server_cmaui_1: + - server_cmaui_1 + - feature + disk.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.allocation + cpu_util_server_cmaui_2_test_nested2: + - test_nested2 + - cpu_util_server_cmaui_2 + disk.device.iops_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.write.bytes_server_cmaui + - disk.device.iops_server_cmaui_2 + binding_server_cmaui_1: + - server_cmaui_1 + - binding + scalable_server_cmaui_2_test_nested2: + - test_nested2 + - scalable_server_cmaui_2 network.incoming.bytes.rate_cmaui_port_11_test_nested2: - test_nested2 - network.incoming.bytes.rate_cmaui_port_11 attachment_cmaui_port_2: - cmaui_port_2 - attachment - scalable_server_cmaui_test_nested2: - - test_nested2 - - scalable_server_cmaui feature_test_nested2: - test_nested2 - feature - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests + scalable_server_cmaui_1: + - server_cmaui_1 + - scalable attachment_cmaui_port_22_test_nested2: - test_nested2 - attachment_cmaui_port_22 - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity network.outgoing.packets.rate_cmaui_port_1: - cmaui_port_1 - network.outgoing.packets.rate network.outgoing.packets.rate_cmaui_port_2: - cmaui_port_2 - network.outgoing.packets.rate - disk.device.allocation_server_cmaui_test_nested2: - - test_nested2 - - disk.device.allocation_server_cmaui - disk.read.bytes_server_cmaui_test_nested2: - - test_nested2 - - disk.read.bytes_server_cmaui - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage attachment_cmaui_port_1: - cmaui_port_1 - attachment - memory_server_cmaui_test_nested2: + disk.write.requests_server_cmaui_2_test_nested2: - test_nested2 - - memory_server_cmaui - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate - disk.device.read.requests_server_cmaui_test_nested2: - - test_nested2 - - disk.device.read.requests_server_cmaui - disk.device.read.bytes.rate_server_cmaui_test_nested2: - - test_nested2 - - disk.device.read.bytes.rate_server_cmaui - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - disk.device.latency_server_cmaui_test_nested2: + - disk.write.requests_server_cmaui_2 + disk.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests + disk.usage_server_cmaui_1: + - server_cmaui_1 + - disk.usage + disk.read.requests_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.latency_server_cmaui - network.outgoing.bytes_cmaui_port_11_test_nested2: + - disk.read.requests_server_cmaui_2 + endpoint_server_cmaui_1: + - server_cmaui_1 + - endpoint + disk.device.capacity_server_cmaui_2_test_nested2: - test_nested2 - - network.outgoing.bytes_cmaui_port_11 - disk.device.write.bytes.rate_server_cmaui_test_nested2: + - disk.device.capacity_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.write.bytes.rate_server_cmaui - instance_server_cmaui_test_nested2: + - disk.device.read.requests.rate_server_cmaui_2 + memory.resident_server_cmaui_2_test_nested2: - test_nested2 - - instance_server_cmaui - memory_server_cmaui: - - server_cmaui - - memory - disk.write.bytes.rate_server_cmaui_test_nested2: + - memory.resident_server_cmaui_2 + disk.usage_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.bytes.rate_server_cmaui - disk.device.usage_server_cmaui_test_nested2: + - disk.usage_server_cmaui_2 + network.outgoing.bytes_cmaui_port_11_test_nested2: - test_nested2 - - disk.device.usage_server_cmaui - binding_server_cmaui: - - server_cmaui - - binding - disk.iops_server_cmaui_test_nested2: + - network.outgoing.bytes_cmaui_port_11 + os_server_cmaui_1: + - server_cmaui_1 + - os + feature_server_cmaui_2_test_nested2: - test_nested2 - - disk.iops_server_cmaui - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - feature_server_cmaui_test_nested2: + - feature_server_cmaui_2 + disk.device.write.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - feature_server_cmaui - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes - disk.device.iops_server_cmaui_test_nested2: + - disk.device.write.requests.rate_server_cmaui_2 + memory_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.iops_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested2: + - memory_server_cmaui_2 + disk.device.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.device.allocation + memory_server_cmaui_1: + - server_cmaui_1 + - memory + disk.device.write.requests_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.write.requests.rate_server_cmaui + - disk.device.write.requests_server_cmaui_2 + host_server_cmaui_1: + - server_cmaui_1 + - host network.outgoing.packets.rate_cmaui_port_11_test_nested2: - test_nested2 - network.outgoing.packets.rate_cmaui_port_11 - disk.device.write.requests_server_cmaui_test_nested2: + disk.read.bytes_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.write.requests_server_cmaui + - disk.read.bytes_server_cmaui_2 network.outgoing.bytes_cmaui_port_22_test_nested2: - test_nested2 - network.outgoing.bytes_cmaui_port_22 - memory.resident_server_cmaui: - - server_cmaui - - memory.resident - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - vcpus_server_cmaui: - - server_cmaui - - vcpus + disk.device.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.device.capacity + disk.device.latency_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.latency_server_cmaui_2 + disk.device.allocation_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui_2 + instance_server_cmaui_1: + - server_cmaui_1 + - instance + disk.device.read.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests.rate network.outgoing.bytes.rate_cmaui_port_22_test_nested2: - test_nested2 - network.outgoing.bytes.rate_cmaui_port_22 - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes network.incoming.bytes.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes.rate network.incoming.bytes.rate_cmaui_port_2: - cmaui_port_2 - network.incoming.bytes.rate - disk.root.size_server_cmaui_test_nested2: - - test_nested2 - - disk.root.size_server_cmaui - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests + vcpus_server_cmaui_1: + - server_cmaui_1 + - vcpus + disk.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes.rate network.outpoing.packets_cmaui_port_1: - cmaui_port_1 - network.outpoing.packets network.outpoing.packets_cmaui_port_2: - cmaui_port_2 - network.outpoing.packets + disk.device.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests + cpu.delta_server_cmaui_1: + - server_cmaui_1 + - cpu.delta + disk.write.bytes_server_cmaui_2_test_nested2: + - test_nested2 + - disk.write.bytes_server_cmaui_2 network.incoming.packets_cmaui_port_22_test_nested2: - test_nested2 - network.incoming.packets_cmaui_port_22 network.incoming.bytes_cmaui_port_22_test_nested2: - test_nested2 - network.incoming.bytes_cmaui_port_22 - cpu.delta_server_cmaui_test_nested2: - - test_nested2 - - cpu.delta_server_cmaui network.outpoing.packets_cmaui_port_22_test_nested2: - test_nested2 - network.outpoing.packets_cmaui_port_22 - endpoint_server_cmaui: - - server_cmaui - - endpoint + memory.resident_server_cmaui_1: + - server_cmaui_1 + - memory.resident feature_cmaui_port_11_test_nested2: - test_nested2 - feature_cmaui_port_11 attachment_cmaui_port_11_test_nested2: - test_nested2 - attachment_cmaui_port_11 - disk.device.capacity_server_cmaui_test_nested2: - - test_nested2 - - disk.device.capacity_server_cmaui + disk.latency_server_cmaui_1: + - server_cmaui_1 + - disk.latency + memory.usage_server_cmaui_1: + - server_cmaui_1 + - memory.usage requirements: dependency_cmaui_port_22_test_nested2: - test_nested2 - dependency_cmaui_port_22 - dependency_server_cmaui: - - server_cmaui - - dependency - dependency_server_cmaui_test_nested2: - - test_nested2 - - dependency_server_cmaui link_cmaui_port_22_test_nested2: - test_nested2 - link_cmaui_port_22 @@ -561,12 +555,15 @@ topology_template: link_cmaui_port_1: - cmaui_port_1 - link - local_storage_server_cmaui_test_nested2: - - test_nested2 - - local_storage_server_cmaui - local_storage_server_cmaui: - - server_cmaui + local_storage_server_cmaui_1: + - server_cmaui_1 - local_storage + dependency_server_cmaui_2_test_nested2: + - test_nested2 + - dependency_server_cmaui_2 + local_storage_server_cmaui_2_test_nested2: + - test_nested2 + - local_storage_server_cmaui_2 dependency_test_nested2: - test_nested2 - dependency @@ -576,6 +573,9 @@ topology_template: link_cmaui_port_11_test_nested2: - test_nested2 - link_cmaui_port_11 + dependency_server_cmaui_1: + - server_cmaui_1 + - dependency dependency_cmaui_port_2: - cmaui_port_2 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml index ce299b2cf5..5ce72bbad2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested.yml @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}] replacement_policy: AUTO - server_cmaui: + server_cmaui_1: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml index 6a123d1641..31a0df731c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/inputs/nested2level.yml @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}] replacement_policy: AUTO - server_cmaui: + server_cmaui_2: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index c139b7e94d..c81dd65a22 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -64,39 +64,41 @@ node_types: occurrences: - 1 - 1 - - dependency_test_nested2: + - dependency_server_cmaui_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_11_test_nested2: + - local_storage_server_cmaui_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11_test_nested2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_cmaui_port_22_test_nested2: + - dependency_server_cmaui_2_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22_test_nested2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_2_test_nested2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED - dependency_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -104,74 +106,72 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_11_test_nested3_test_nested2: + - dependency_server_cmaui_3_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11_test_nested3_test_nested2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_3_test_nested3_test_nested2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_cmaui_port_22_test_nested3_test_nested2: + - 0 + - UNBOUNDED + - dependency_cmaui_port_311_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22_test_nested3_test_nested2: + - link_cmaui_port_311_test_nested3_test_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested3_test_nested2: + - dependency_cmaui_port_322_test_nested3_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested3_test_nested2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_322_test_nested3_test_nested2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_server_cmaui_test_nested2: + - 1 + - 1 + - dependency_cmaui_port_211_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_211_test_nested2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_server_cmaui: + - 1 + - 1 + - dependency_cmaui_port_222_test_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_222_test_nested2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 - dependency_cmaui_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -186,31 +186,25 @@ node_types: - 1 - 1 capabilities: - cpu.delta_server_cmaui: + disk.iops_server_cmaui_3_test_nested3_test_nested2: type: org.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: + network.outpoing.packets_cmaui_port_222_test_nested2: type: org.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_22_test_nested2: + disk.device.usage_server_cmaui_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.allocation_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested3_test_nested2: + memory.usage_server_cmaui_3_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -221,458 +215,467 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_cmaui_test_nested2: + disk.device.latency_server_cmaui_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.capacity_server_cmaui_test_nested2: + disk.device.usage_server_cmaui_2_test_nested2: type: org.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: - type: tosca.capabilities.Scalable + host_server_cmaui_2_test_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + disk.root.size_server_cmaui_2_test_nested2: type: org.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_test_nested2: - 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_nested3_test_nested2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested2: - 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_311_test_nested3_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested3_test_nested2: + memory_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + network.outgoing.bytes_cmaui_port_222_test_nested2: type: org.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: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.write.bytes.rate_server_cmaui_2_test_nested2: + type: org.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: - 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_322_test_nested3_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_cmaui_port_11_test_nested2: + binding_cmaui_port_322_test_nested3_test_nested2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - endpoint_server_cmaui_test_nested2: - type: tosca.capabilities.Endpoint.Admin + disk.root.size_server_cmaui_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_server_cmaui_test_nested2: + disk.device.write.requests.rate_server_cmaui_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_cmaui_port_11_test_nested3_test_nested2: - type: tosca.capabilities.Node + network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2: + type: org.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_22_test_nested3_test_nested2: - type: tosca.capabilities.Node + binding_cmaui_port_311_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.device.write.requests_server_cmaui: + network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2: type: org.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_2: + disk.write.bytes.rate_server_cmaui_2_test_nested2: type: org.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_1: + disk.iops_server_cmaui_2_test_nested2: type: org.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_test_nested2: + network.outgoing.packets.rate_cmaui_port_322_test_nested3_test_nested2: type: org.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_11_test_nested3_test_nested2: + network.outgoing.bytes_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. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested3_test_nested2: + disk.read.requests_server_cmaui_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_cmaui_port_11_test_nested2: + network.outgoing.packets.rate_cmaui_port_311_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + network.outgoing.packets.rate_cmaui_port_222_test_nested2: type: org.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: + network.outgoing.bytes_cmaui_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_server_cmaui: + cpu.delta_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + disk.device.iops_server_cmaui_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.root.size_server_cmaui: + network.incoming.packets_cmaui_port_311_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: + disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.allocation_server_cmaui_test_nested3_test_nested2: + disk.latency_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested2: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.capacity_server_cmaui_test_nested3_test_nested2: + disk.allocation_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: - type: tosca.capabilities.OperatingSystem + disk.device.read.bytes.rate_server_cmaui_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_cmaui_port_2: + disk.read.bytes_server_cmaui_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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + host_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + disk.device.read.bytes_server_cmaui_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 - binding_server_cmaui_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.ephemeral.size_server_cmaui_test_nested3_test_nested2: + cpu_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: + disk.device.read.bytes.rate_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.device.read.bytes_server_cmaui_2_test_nested2: type: org.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_1: + disk.write.requests.rate_server_cmaui_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_cmaui_port_11_test_nested3_test_nested2: + network.outgoing.packets.rate_cmaui_port_211_test_nested2: type: org.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_22_test_nested2: - 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_2_test_nested2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui_test_nested2: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: + cpu.delta_server_cmaui_2_test_nested2: type: org.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_test_nested2: + instance_server_cmaui_2_test_nested2: type: org.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_11_test_nested2: + cpu_server_cmaui_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 - os_server_cmaui_test_nested2: - type: tosca.capabilities.OperatingSystem + network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2: + type: org.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_22_test_nested2: + feature_cmaui_port_211_test_nested2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui_test_nested2: + network.incoming.packets_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. occurrences: - 1 - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node + memory.usage_server_cmaui_2_test_nested2: + type: org.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_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_cmaui_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.iops_server_cmaui_test_nested3_test_nested2: + disk.write.requests.rate_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: + disk.capacity_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: + network.incoming.packets_cmaui_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_cmaui_port_22_test_nested3_test_nested2: + disk.device.write.bytes_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.write.requests_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: + disk.ephemeral.size_server_cmaui_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 - vcpus_server_cmaui_test_nested2: + disk.capacity_server_cmaui_2_test_nested2: type: org.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: + disk.capacity_server_cmaui_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.ephemeral.size_server_cmaui: + disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + disk.latency_server_cmaui_2_test_nested2: type: org.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_2: + disk.read.bytes.rate_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: + network.incoming.bytes.rate_cmaui_port_211_test_nested2: type: org.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_test_nested2: + disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested2: + disk.device.read.requests_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: - 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_211_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_server_cmaui_2_test_nested2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_22_test_nested2: + os_server_cmaui_2_test_nested2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_211_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + binding_cmaui_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_cmaui_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_2_test_nested2: type: org.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_1: + disk.iops_server_cmaui_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_server_cmaui_test_nested3_test_nested2: + vcpus_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: + binding_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_server_cmaui_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.rate_cmaui_port_11_test_nested2: + network.outgoing.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_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_server_cmaui_test_nested2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + cpu_util_server_cmaui_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.usage_server_cmaui_test_nested2: + network.outgoing.bytes.rate_cmaui_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.iops_server_cmaui: + network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -684,93 +687,90 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + cpu_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + network.incoming.bytes_cmaui_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_server_cmaui: + network.incoming.packets_cmaui_port_222_test_nested2: type: org.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_1: + network.incoming.packets.rate_cmaui_port_222_test_nested2: type: org.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_test_nested3_test_nested2: + network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: + 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.ephemeral.size_server_cmaui_test_nested2: + network.outgoing.bytes.rate_cmaui_port_222_test_nested2: type: org.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_11_test_nested3_test_nested2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: + 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.read.requests_server_cmaui_test_nested3_test_nested2: + disk.write.bytes.rate_server_cmaui_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 - scalable_server_cmaui_test_nested3_test_nested2: - type: tosca.capabilities.Scalable + disk.device.write.bytes_server_cmaui_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_cmaui_port_11_test_nested2: + disk.read.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.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_11_test_nested2: + memory.resident_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + disk.device.latency_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + attachment_cmaui_port_222_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui_test_nested2: + network.incoming.bytes_cmaui_port_222_test_nested2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -788,12 +788,22 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_cmaui: + feature_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cmaui_port_222_test_nested2: type: org.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_311_test_nested3_test_nested2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED feature_cmaui_port_1: type: tosca.capabilities.Node occurrences: @@ -804,111 +814,102 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + disk.write.bytes_server_cmaui_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_cmaui_port_22_test_nested3_test_nested2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + disk.allocation_server_cmaui_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_cmaui_port_11_test_nested3_test_nested2: - 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_322_test_nested3_test_nested2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_cmaui_test_nested2: + disk.device.capacity_server_cmaui_3_test_nested3_test_nested2: type: org.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_11_test_nested2: + cpu_util_server_cmaui_2_test_nested2: type: org.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_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - scalable_server_cmaui_test_nested2: - type: tosca.capabilities.Scalable + network.incoming.packets_cmaui_port_211_test_nested2: + type: org.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_nested2: - type: tosca.capabilities.Node + disk.device.iops_server_cmaui_2_test_nested2: + type: org.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_cmaui_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui: + network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2: type: org.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_22_test_nested2: - type: tosca.capabilities.Attachment + scalable_server_cmaui_2_test_nested2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_cmaui: + network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: type: org.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_1: - 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_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_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. + feature_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested2: - 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_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui_test_nested2: + disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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: + network.outgoing.packets.rate_cmaui_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_server_cmaui: + network.outgoing.packets.rate_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. occurrences: @@ -919,319 +920,333 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested2: + disk.device.usage_server_cmaui_3_test_nested3_test_nested2: type: org.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: + disk.write.requests_server_cmaui_2_test_nested2: type: org.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: + disk.root.size_server_cmaui_3_test_nested3_test_nested2: type: org.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_11_test_nested3_test_nested2: + disk.write.requests_server_cmaui_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.requests_server_cmaui_test_nested2: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: + disk.usage_server_cmaui_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_server_cmaui_test_nested2: - 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_222_test_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + disk.read.requests_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: - 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_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested2: + disk.device.capacity_server_cmaui_2_test_nested2: type: org.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_11_test_nested2: + disk.device.read.requests.rate_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: + memory.resident_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.usage_server_cmaui_2_test_nested2: type: org.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_test_nested2: + disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: type: org.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_11_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2: + network.outgoing.bytes.rate_cmaui_port_211_test_nested2: type: org.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_test_nested2: + disk.device.write.requests.rate_server_cmaui_2_test_nested2: type: org.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_test_nested2: + feature_server_cmaui_2_test_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_2_test_nested2: type: org.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: - type: tosca.capabilities.network.Bindable + disk.device.allocation_server_cmaui_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.iops_server_cmaui_test_nested2: + network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + memory_server_cmaui_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.requests.rate_server_cmaui: + disk.device.iops_server_cmaui_3_test_nested3_test_nested2: type: org.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_11_test_nested3_test_nested2: + disk.device.write.requests_server_cmaui_2_test_nested2: type: org.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_test_nested2: - type: tosca.capabilities.Node + host_server_cmaui_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui_test_nested3_test_nested2: + network.incoming.packets.rate_cmaui_port_211_test_nested2: type: org.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_test_nested3_test_nested2: + disk.read.bytes_server_cmaui_2_test_nested2: type: org.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: + disk.allocation_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested2: + vcpus_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested2: + network.outgoing.bytes_cmaui_port_211_test_nested2: type: org.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_11_test_nested2: + disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: - type: tosca.capabilities.Node + disk.read.requests_server_cmaui_3_test_nested3_test_nested2: + type: org.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_test_nested3_test_nested2: + instance_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested3_test_nested2: - type: tosca.capabilities.Attachment + disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: + type: org.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_test_nested2: + network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: type: org.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_22_test_nested2: + disk.device.capacity_server_cmaui_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 - cpu.delta_server_cmaui_test_nested3_test_nested2: + disk.device.latency_server_cmaui_2_test_nested2: type: org.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_test_nested3_test_nested2: - type: tosca.capabilities.Endpoint.Admin + disk.usage_server_cmaui_3_test_nested3_test_nested2: + type: org.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: + network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + network.outpoing.packets_cmaui_port_211_test_nested2: type: org.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: + disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.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: + disk.device.allocation_server_cmaui_2_test_nested2: type: org.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_22_test_nested2: + instance_server_cmaui_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.write.bytes_server_cmaui: + disk.device.read.requests.rate_server_cmaui_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_cmaui_port_1: + network.incoming.bytes_cmaui_port_211_test_nested2: type: org.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_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_222_test_nested2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_cmaui_3_test_nested3_test_nested2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2: + network.incoming.bytes.rate_cmaui_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_server_cmaui_test_nested3_test_nested2: + network.incoming.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui_test_nested2: + network.incoming.packets_cmaui_port_322_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + vcpus_server_cmaui_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.allocation_server_cmaui: + disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: type: org.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: + disk.read.bytes.rate_server_cmaui_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: @@ -1249,64 +1264,49 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_22_test_nested2: + disk.device.read.requests_server_cmaui_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_cmaui_port_22_test_nested2: + cpu.delta_server_cmaui_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 - cpu.delta_server_cmaui_test_nested2: + disk.write.bytes_server_cmaui_2_test_nested2: type: org.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_11_test_nested3_test_nested2: + cpu_util_server_cmaui_3_test_nested3_test_nested2: type: org.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_22_test_nested2: + disk.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: type: org.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_test_nested3_test_nested2: + memory.resident_server_cmaui_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 - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_11_test_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_cmaui_port_11_test_nested2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + disk.latency_server_cmaui_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.capacity_server_cmaui_test_nested2: + memory.usage_server_cmaui_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: @@ -1358,414 +1358,414 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_cmaui_port_11: + - dependency_server_cmaui_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_3: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_cmaui_port_22: + - 0 + - UNBOUNDED + - dependency_cmaui_port_311: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22: + - link_cmaui_port_311: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_cmaui: + - dependency_cmaui_port_322: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_322: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 capabilities: - cpu.delta_server_cmaui: + disk.write.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui: + disk.device.write.bytes_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. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_11: + disk.device.usage_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_22: + disk.device.latency_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. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_22: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.write.bytes_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. occurrences: - - 0 + - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.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. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + network.outgoing.bytes_cmaui_port_311: type: org.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: + binding_server_cmaui_3: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + vcpus_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. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + 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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + disk.device.write.requests.rate_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. occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + scalable_server_cmaui_3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu_util_server_cmaui: + network.incoming.packets.rate_cmaui_port_311: type: org.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_22: + disk.read.requests_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. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui: + disk.write.requests_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui: + disk.usage_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. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui: + network.incoming.bytes_cmaui_port_311: type: org.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: - 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_311: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui: + disk.device.iops_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. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui: + disk.device.capacity_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_22: + network.outpoing.packets_cmaui_port_311: type: org.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: + network.incoming.packets_cmaui_port_322: type: org.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: + disk.device.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_22: - 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: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + disk.read.bytes_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. occurrences: - 1 - UNBOUNDED - instance_server_cmaui: + network.outgoing.bytes_cmaui_port_322: type: org.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_3: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + disk.write.requests.rate_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. occurrences: - 1 - UNBOUNDED - feature_cmaui_port_22: + feature_cmaui_port_311: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.root.size_server_cmaui: + network.incoming.bytes.rate_cmaui_port_322: type: org.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_22: + disk.device.read.bytes_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. occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + memory_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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + 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. occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + cpu_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_11: + network.incoming.bytes_cmaui_port_322: type: org.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_11: - type: tosca.capabilities.Node + host_server_cmaui_3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_22: + attachment_cmaui_port_322: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_11: + network.incoming.packets_cmaui_port_311: type: org.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_11: + network.outpoing.packets_cmaui_port_322: type: org.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_22: + disk.ephemeral.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. occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui: + disk.capacity_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_22: + network.outgoing.packets.rate_cmaui_port_311: type: org.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: + binding_cmaui_port_311: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_311: type: org.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: + instance_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. + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_322: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_server_cmaui: + network.incoming.bytes.rate_cmaui_port_311: type: org.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: + disk.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_cmaui: + disk.device.write.requests_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_cmaui: + disk.iops_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_11: + disk.device.read.requests_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. occurrences: - 1 - UNBOUNDED - binding_cmaui_port_11: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_server_cmaui: + disk.device.read.requests.rate_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. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui: + network.outgoing.packets.rate_cmaui_port_322: type: org.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_11: - type: tosca.capabilities.Attachment + binding_cmaui_port_322: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_11: + cpu.delta_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. occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + memory.resident_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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_22: + network.outgoing.bytes.rate_cmaui_port_322: type: org.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: + disk.latency_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_11: + network.incoming.packets.rate_cmaui_port_322: type: org.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: + memory.usage_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cmaui_port_11: + cpu_util_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui: + disk.device.write.bytes.rate_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. occurrences: @@ -1817,838 +1817,838 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_cmaui_port_11: + - dependency_server_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_cmaui_port_22: + - 0 + - UNBOUNDED + - dependency_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_test_nested3: + - dependency_server_cmaui_3_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_cmaui_port_11_test_nested3: + - local_storage_server_cmaui_3_test_nested3: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_cmaui_port_311_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_11_test_nested3: + - link_cmaui_port_311_test_nested3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cmaui_port_22_test_nested3: + - dependency_cmaui_port_322_test_nested3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_22_test_nested3: + - link_cmaui_port_322_test_nested3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_cmaui_test_nested3: + - dependency_cmaui_port_211: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui_test_nested3: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_211: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_server_cmaui: + - 1 + - 1 + - dependency_cmaui_port_222: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_222: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 capabilities: - cpu.delta_server_cmaui: + disk.device.write.bytes_server_cmaui_3_test_nested3: type: org.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: + memory.usage_server_cmaui_3_test_nested3: type: org.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: + network.incoming.bytes_cmaui_port_222: type: org.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_test_nested3: + network.incoming.packets_cmaui_port_211: type: org.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_test_nested3: + 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 - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + cpu_server_cmaui_3_test_nested3: type: org.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_22_test_nested3: + disk.latency_server_cmaui_3_test_nested3: type: org.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_test_nested3: + 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.read.bytes.rate_server_cmaui_test_nested3: + disk.read.bytes.rate_server_cmaui_3_test_nested3: type: org.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: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - cpu_util_server_cmaui: + 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.packets.rate_cmaui_port_22: + 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 - binding_cmaui_port_11_test_nested3: + binding_server_cmaui_3_test_nested3: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - endpoint_server_cmaui_test_nested3: - type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui_test_nested3: + disk.write.requests.rate_server_cmaui_3_test_nested3: type: org.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: + network.incoming.packets.rate_cmaui_port_311_test_nested3: type: org.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_11_test_nested3: + disk.device.latency_server_cmaui_3_test_nested3: type: org.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_test_nested3: + 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 - instance_server_cmaui: + disk.device.allocation_server_cmaui_3_test_nested3: type: org.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: + memory_server_cmaui_3_test_nested3: type: org.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: + disk.device.read.requests.rate_server_cmaui_3_test_nested3: type: org.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_22: + 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 - binding_cmaui_port_22_test_nested3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.packets.rate_cmaui_port_311_test_nested3: + 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_server_cmaui_test_nested3: - type: tosca.capabilities.network.Bindable + 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 - network.incoming.bytes.rate_cmaui_port_22_test_nested3: + 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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + disk.read.requests_server_cmaui_3_test_nested3: + type: org.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: + 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 - disk.allocation_server_cmaui_test_nested3: + disk.usage_server_cmaui_3_test_nested3: type: org.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_test_nested3: + 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 - feature_cmaui_port_11: + feature_server_cmaui_3_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_11: + endpoint_server_cmaui_3_test_nested3: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_322_test_nested3: type: org.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_test_nested3: + 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 - network.outgoing.bytes_cmaui_port_11: + disk.device.read.bytes_server_cmaui_3_test_nested3: type: org.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_11_test_nested3: + instance_server_cmaui_3_test_nested3: type: org.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_test_nested3: - type: tosca.capabilities.OperatingSystem + cpu.delta_server_cmaui_3_test_nested3: + type: org.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_22_test_nested3: - type: tosca.capabilities.Node + 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 - cpu_util_server_cmaui_test_nested3: + 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 - feature_server_cmaui: - type: tosca.capabilities.Node + host_server_cmaui_3_test_nested3: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.usage_server_cmaui_test_nested3: + network.incoming.packets_cmaui_port_311_test_nested3: type: org.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_test_nested3: + 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 - memory.usage_server_cmaui: + disk.device.usage_server_cmaui_3_test_nested3: type: org.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_test_nested3: + 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 - disk.ephemeral.size_server_cmaui: + disk.device.iops_server_cmaui_3_test_nested3: type: org.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_22_test_nested3: + disk.device.write.bytes.rate_server_cmaui_3_test_nested3: type: org.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_test_nested3: + network.outgoing.bytes_cmaui_port_211: type: org.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_11: + network.incoming.bytes_cmaui_port_311_test_nested3: type: org.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_test_nested3: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.capacity_server_cmaui_3_test_nested3: + type: org.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_22: - 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_nested3: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_11_test_nested3: + binding_cmaui_port_322_test_nested3: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_cmaui_port_211: type: org.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_11_test_nested3: + disk.write.bytes.rate_server_cmaui_3_test_nested3: type: org.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: + network.incoming.bytes.rate_cmaui_port_322_test_nested3: type: org.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: + disk.write.bytes_server_cmaui_3_test_nested3: type: org.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_11_test_nested3: + 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.read.bytes_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_211: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu_server_cmaui_test_nested3: + network.outpoing.packets_cmaui_port_211: type: org.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_test_nested3: + network.incoming.bytes_cmaui_port_211: type: org.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_11: + network.incoming.packets_cmaui_port_222: type: org.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_22: + 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 - binding_cmaui_port_22: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - attachment_cmaui_port_11_test_nested3: - type: tosca.capabilities.Attachment + network.outpoing.packets_cmaui_port_311_test_nested3: + type: org.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_test_nested3: + network.outgoing.bytes_cmaui_port_222: type: org.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: + network.outgoing.bytes_cmaui_port_311_test_nested3: type: org.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: - 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_322_test_nested3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + network.incoming.bytes.rate_cmaui_port_222: type: org.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_test_nested3: + 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 - feature_test_nested3: - type: tosca.capabilities.Node + 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 - network.incoming.bytes.rate_cmaui_port_11_test_nested3: + 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 - disk.read.bytes_server_cmaui_test_nested3: + 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 - scalable_server_cmaui_test_nested3: - type: tosca.capabilities.Scalable + attachment_cmaui_port_222: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui: + network.outpoing.packets_cmaui_port_222: type: org.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: + disk.read.bytes_server_cmaui_3_test_nested3: type: org.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: + disk.device.write.requests_server_cmaui_3_test_nested3: type: org.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: - 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_311_test_nested3: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.device.allocation_server_cmaui_test_nested3: + disk.capacity_server_cmaui_3_test_nested3: type: org.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: + 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 - network.outgoing.bytes.rate_cmaui_port_22: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_22_test_nested3: - type: tosca.capabilities.Attachment + feature_cmaui_port_311_test_nested3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_server_cmaui_test_nested3: + network.outgoing.packets.rate_cmaui_port_211: type: org.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: + binding_cmaui_port_211: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes.rate_cmaui_port_211: type: org.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: + 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 - disk.device.read.requests_server_cmaui_test_nested3: + disk.device.read.requests_server_cmaui_3_test_nested3: type: org.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_22: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cmaui_port_11_test_nested3: - 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_nested3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: + 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 - disk.device.read.bytes.rate_server_cmaui_test_nested3: - 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_222: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.latency_server_cmaui_test_nested3: + network.incoming.bytes.rate_cmaui_port_211: type: org.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_test_nested3: - 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 - disk.device.write.bytes.rate_server_cmaui_test_nested3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_3_test_nested3: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - memory_server_cmaui: + disk.write.requests_server_cmaui_3_test_nested3: type: org.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_22: - type: tosca.capabilities.Node + 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.write.bytes.rate_server_cmaui_test_nested3: + 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 - disk.device.usage_server_cmaui_test_nested3: + network.incoming.bytes.rate_cmaui_port_311_test_nested3: type: org.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: - type: tosca.capabilities.network.Bindable + endpoint_server_cmaui_2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.iops_server_cmaui_test_nested3: + memory.resident_server_cmaui_3_test_nested3: type: org.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: + disk.allocation_server_cmaui_3_test_nested3: type: org.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: + network.outgoing.bytes.rate_cmaui_port_311_test_nested3: type: org.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_11: + network.outgoing.packets.rate_cmaui_port_222: type: org.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_test_nested3: + binding_cmaui_port_222: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + feature_cmaui_port_322_test_nested3: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_cmaui_test_nested3: + network.outgoing.bytes.rate_cmaui_port_222: type: org.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_11_test_nested3: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3: type: org.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_test_nested3: + disk.device.write.requests.rate_server_cmaui_3_test_nested3: type: org.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_22_test_nested3: + network.incoming.packets.rate_cmaui_port_222: type: org.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_22_test_nested3: + 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 - attachment_cmaui_port_22: - type: tosca.capabilities.Attachment + network.outgoing.bytes_cmaui_port_322_test_nested3: + type: org.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_22_test_nested3: - 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.incoming.packets_cmaui_port_22: + network.outgoing.packets.rate_cmaui_port_322_test_nested3: type: org.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: + disk.iops_server_cmaui_3_test_nested3: type: org.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_22: - 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_311_test_nested3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.iops_server_cmaui_test_nested3: + cpu_util_server_cmaui_3_test_nested3: type: org.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_22_test_nested3: + network.outpoing.packets_cmaui_port_322_test_nested3: type: org.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_test_nested3: + 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 - disk.latency_server_cmaui: + disk.root.size_server_cmaui_3_test_nested3: type: org.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: + vcpus_server_cmaui_3_test_nested3: type: org.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: + disk.ephemeral.size_server_cmaui_3_test_nested3: type: org.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: + 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 - disk.write.requests_server_cmaui: + 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 - network.outgoing.packets.rate_cmaui_port_11: + 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 - binding_cmaui_port_11: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - cpu.delta_server_cmaui_test_nested3: + 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 - network.outpoing.packets_cmaui_port_22_test_nested3: + network.incoming.packets_cmaui_port_322_test_nested3: type: org.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_11: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cmaui_port_322_test_nested3: + type: org.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: - type: tosca.capabilities.Endpoint.Admin + 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: - 1 - UNBOUNDED - feature_cmaui_port_11_test_nested3: + feature_cmaui_port_211: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_11: + disk.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 - network.incoming.bytes_cmaui_port_11: + network.incoming.bytes_cmaui_port_322_test_nested3: type: org.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_test_nested3: + memory.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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml index 9d3f823368..ed19586cc8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -103,27 +103,27 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_cmaui_port_2 + capability: attachment_cmaui_port_211_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_22_test_nested2 + capability: attachment_cmaui_port_222_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_1 + capability: attachment_cmaui_port_311_test_nested3_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_11_test_nested3_test_nested2 + capability: attachment_cmaui_port_322_test_nested3_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_22_test_nested3_test_nested2 + capability: attachment_cmaui_port_2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_11_test_nested2 + capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo jsa_security_group2: @@ -199,15 +199,15 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_cmaui_port_1 + capability: attachment_cmaui_port_211_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_11_test_nested3_test_nested2 + capability: attachment_cmaui_port_311_test_nested3_test_nested2 node: test_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cmaui_port_11_test_nested2 + capability: attachment_cmaui_port_1 node: test_nested relationship: org.openecomp.relationships.AttachesTo test_nested: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 334da11673..12b75836dc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -55,7 +55,31 @@ topology_template: type: string description: UID of OAM network node_templates: - cmaui_port_11: + server_cmaui_2: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + name: + get_input: + - cmaui_names + - 0 + test_nested3: + type: org.openecomp.resource.abstract.nodes.heat.nested3level + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested3levelServiceTemplate.yaml + p2: + get_input: p2 + shared_security_group_id1: + get_input: shared_security_group_id1 + cmaui_port_211: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -81,9 +105,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo - cmaui_port_22: + cmaui_port_222: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -108,32 +132,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo - test_nested3: - type: org.openecomp.resource.abstract.nodes.heat.nested3level - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested3levelServiceTemplate.yaml - p2: - get_input: p2 - shared_security_group_id1: - get_input: shared_security_group_id1 - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 groups: nested2level_group: type: org.openecomp.groups.heat.HeatStack @@ -141,431 +141,431 @@ topology_template: heat_file: ../Artifacts/nested2level.yml description: cmaui server template for vMMSC members: - - cmaui_port_11 - - cmaui_port_22 + - server_cmaui_2 - test_nested3 - - server_cmaui + - cmaui_port_211 + - cmaui_port_222 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2level capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation - disk.write.requests.rate_server_cmaui_test_nested3: + disk.device.write.bytes_server_cmaui_3_test_nested3: - test_nested3 - - disk.write.requests.rate_server_cmaui - disk.capacity_server_cmaui_test_nested3: + - disk.device.write.bytes_server_cmaui_3 + memory.usage_server_cmaui_3_test_nested3: - test_nested3 - - disk.capacity_server_cmaui - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - network.incoming.packets.rate_cmaui_port_22_test_nested3: + - memory.usage_server_cmaui_3 + network.incoming.bytes_cmaui_port_222: + - cmaui_port_222 + - network.incoming.bytes + network.incoming.packets_cmaui_port_211: + - cmaui_port_211 + - network.incoming.packets + disk.device.usage_server_cmaui_2: + - server_cmaui_2 + - disk.device.usage + cpu_server_cmaui_3_test_nested3: - test_nested3 - - network.incoming.packets.rate_cmaui_port_22 - disk.latency_server_cmaui_test_nested3: + - cpu_server_cmaui_3 + disk.latency_server_cmaui_3_test_nested3: - test_nested3 - - disk.latency_server_cmaui - disk.read.bytes.rate_server_cmaui_test_nested3: + - disk.latency_server_cmaui_3 + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + disk.read.bytes.rate_server_cmaui_3_test_nested3: - test_nested3 - - disk.read.bytes.rate_server_cmaui - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util - network.incoming.packets.rate_cmaui_port_22: - - cmaui_port_22 - - network.incoming.packets.rate - binding_cmaui_port_11_test_nested3: + - disk.read.bytes.rate_server_cmaui_3 + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate + binding_server_cmaui_3_test_nested3: - test_nested3 - - binding_cmaui_port_11 - endpoint_server_cmaui_test_nested3: + - binding_server_cmaui_3 + disk.write.requests.rate_server_cmaui_3_test_nested3: - test_nested3 - - endpoint_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested3: + - disk.write.requests.rate_server_cmaui_3 + network.incoming.packets.rate_cmaui_port_311_test_nested3: - test_nested3 - - disk.device.read.bytes_server_cmaui - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests - network.incoming.packets.rate_cmaui_port_11_test_nested3: + - network.incoming.packets.rate_cmaui_port_311 + disk.device.latency_server_cmaui_3_test_nested3: - test_nested3 - - network.incoming.packets.rate_cmaui_port_11 - memory.usage_server_cmaui_test_nested3: + - disk.device.latency_server_cmaui_3 + disk.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.read.requests + disk.device.allocation_server_cmaui_3_test_nested3: - test_nested3 - - memory.usage_server_cmaui - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui - - disk.device.read.bytes - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size - network.incoming.bytes.rate_cmaui_port_22: - - cmaui_port_22 - - network.incoming.bytes.rate - binding_cmaui_port_22_test_nested3: + - disk.device.allocation_server_cmaui_3 + memory_server_cmaui_3_test_nested3: - test_nested3 - - binding_cmaui_port_22 - binding_server_cmaui_test_nested3: + - memory_server_cmaui_3 + disk.device.read.requests.rate_server_cmaui_3_test_nested3: - test_nested3 - - binding_server_cmaui - network.incoming.bytes.rate_cmaui_port_22_test_nested3: + - disk.device.read.requests.rate_server_cmaui_3 + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + network.outgoing.packets.rate_cmaui_port_311_test_nested3: - test_nested3 - - network.incoming.bytes.rate_cmaui_port_22 - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate - disk.allocation_server_cmaui_test_nested3: + - network.outgoing.packets.rate_cmaui_port_311 + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + disk.read.requests_server_cmaui_3_test_nested3: - test_nested3 - - disk.allocation_server_cmaui - disk.read.requests_server_cmaui_test_nested3: + - disk.read.requests_server_cmaui_3 + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes + disk.usage_server_cmaui_3_test_nested3: - test_nested3 - - disk.read.requests_server_cmaui - feature_cmaui_port_11: - - cmaui_port_11 - - feature - network.incoming.bytes.rate_cmaui_port_11: - - cmaui_port_11 - - network.incoming.bytes.rate - disk.write.requests_server_cmaui_test_nested3: + - disk.usage_server_cmaui_3 + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes + feature_server_cmaui_3_test_nested3: - test_nested3 - - disk.write.requests_server_cmaui - network.outgoing.bytes_cmaui_port_11: - - cmaui_port_11 - - network.outgoing.bytes - network.outpoing.packets_cmaui_port_11_test_nested3: + - feature_server_cmaui_3 + endpoint_server_cmaui_3_test_nested3: - test_nested3 - - network.outpoing.packets_cmaui_port_11 - os_server_cmaui_test_nested3: + - endpoint_server_cmaui_3 + network.outgoing.bytes.rate_cmaui_port_322_test_nested3: - test_nested3 - - os_server_cmaui - feature_cmaui_port_22_test_nested3: + - network.outgoing.bytes.rate_cmaui_port_322 + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + disk.device.read.bytes_server_cmaui_3_test_nested3: - test_nested3 - - feature_cmaui_port_22 - cpu_util_server_cmaui_test_nested3: + - disk.device.read.bytes_server_cmaui_3 + instance_server_cmaui_3_test_nested3: - test_nested3 - - cpu_util_server_cmaui - feature_server_cmaui: - - server_cmaui - - feature - disk.usage_server_cmaui_test_nested3: + - instance_server_cmaui_3 + cpu.delta_server_cmaui_3_test_nested3: - test_nested3 - - disk.usage_server_cmaui - disk.write.bytes_server_cmaui_test_nested3: + - cpu.delta_server_cmaui_3 + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + host_server_cmaui_3_test_nested3: - test_nested3 - - disk.write.bytes_server_cmaui - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - vcpus_server_cmaui_test_nested3: + - host_server_cmaui_3 + network.incoming.packets_cmaui_port_311_test_nested3: - test_nested3 - - vcpus_server_cmaui - disk.ephemeral.size_server_cmaui: - - server_cmaui + - network.incoming.packets_cmaui_port_311 + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 - disk.ephemeral.size - network.outgoing.packets.rate_cmaui_port_22_test_nested3: + disk.device.usage_server_cmaui_3_test_nested3: - test_nested3 - - network.outgoing.packets.rate_cmaui_port_22 - memory.resident_server_cmaui_test_nested3: + - disk.device.usage_server_cmaui_3 + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity + disk.device.iops_server_cmaui_3_test_nested3: - test_nested3 - - memory.resident_server_cmaui - network.incoming.packets.rate_cmaui_port_11: - - cmaui_port_11 - - network.incoming.packets.rate - host_server_cmaui_test_nested3: + - disk.device.iops_server_cmaui_3 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3: - test_nested3 - - host_server_cmaui - network.outgoing.bytes_cmaui_port_22: - - cmaui_port_22 + - disk.device.write.bytes.rate_server_cmaui_3 + network.outgoing.bytes_cmaui_port_211: + - cmaui_port_211 - network.outgoing.bytes - network.incoming.packets_cmaui_port_11_test_nested3: + network.incoming.bytes_cmaui_port_311_test_nested3: - test_nested3 - - network.incoming.packets_cmaui_port_11 - network.incoming.bytes_cmaui_port_11_test_nested3: + - network.incoming.bytes_cmaui_port_311 + disk.device.capacity_server_cmaui_3_test_nested3: - test_nested3 - - network.incoming.bytes_cmaui_port_11 - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops - network.outgoing.bytes.rate_cmaui_port_11_test_nested3: + - disk.device.capacity_server_cmaui_3 + scalable_server_cmaui_3_test_nested3: - test_nested3 - - network.outgoing.bytes.rate_cmaui_port_11 - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes - cpu_server_cmaui_test_nested3: + - scalable_server_cmaui_3 + binding_cmaui_port_322_test_nested3: - test_nested3 - - cpu_server_cmaui - disk.ephemeral.size_server_cmaui_test_nested3: + - binding_cmaui_port_322 + network.incoming.packets.rate_cmaui_port_211: + - cmaui_port_211 + - network.incoming.packets.rate + disk.write.bytes.rate_server_cmaui_3_test_nested3: - test_nested3 - - disk.ephemeral.size_server_cmaui - network.outpoing.packets_cmaui_port_11: - - cmaui_port_11 - - network.outpoing.packets - network.outgoing.packets.rate_cmaui_port_22: - - cmaui_port_22 - - network.outgoing.packets.rate - binding_cmaui_port_22: - - cmaui_port_22 - - binding - attachment_cmaui_port_11_test_nested3: + - disk.write.bytes.rate_server_cmaui_3 + network.incoming.bytes.rate_cmaui_port_322_test_nested3: - test_nested3 - - attachment_cmaui_port_11 - disk.device.read.requests.rate_server_cmaui_test_nested3: + - network.incoming.bytes.rate_cmaui_port_322 + disk.write.bytes_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.read.requests.rate_server_cmaui - cpu_server_cmaui: - - server_cmaui - - cpu - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - disk.device.write.bytes_server_cmaui_test_nested3: + - disk.write.bytes_server_cmaui_3 + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + attachment_cmaui_port_211: + - cmaui_port_211 + - attachment + network.outpoing.packets_cmaui_port_211: + - cmaui_port_211 + - network.outpoing.packets + network.incoming.bytes_cmaui_port_211: + - cmaui_port_211 + - network.incoming.bytes + network.incoming.packets_cmaui_port_222: + - cmaui_port_222 + - network.incoming.packets + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests + network.outpoing.packets_cmaui_port_311_test_nested3: - test_nested3 - - disk.device.write.bytes_server_cmaui - feature_test_nested3: + - network.outpoing.packets_cmaui_port_311 + network.outgoing.bytes_cmaui_port_222: + - cmaui_port_222 + - network.outgoing.bytes + network.outgoing.bytes_cmaui_port_311_test_nested3: - test_nested3 - - feature - network.incoming.bytes.rate_cmaui_port_11_test_nested3: + - network.outgoing.bytes_cmaui_port_311 + attachment_cmaui_port_322_test_nested3: - test_nested3 - - network.incoming.bytes.rate_cmaui_port_11 - disk.read.bytes_server_cmaui_test_nested3: + - attachment_cmaui_port_322 + network.incoming.bytes.rate_cmaui_port_222: + - cmaui_port_222 + - network.incoming.bytes.rate + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + attachment_cmaui_port_222: + - cmaui_port_222 + - attachment + network.outpoing.packets_cmaui_port_222: + - cmaui_port_222 + - network.outpoing.packets + disk.read.bytes_server_cmaui_3_test_nested3: - test_nested3 - - disk.read.bytes_server_cmaui - scalable_server_cmaui_test_nested3: + - disk.read.bytes_server_cmaui_3 + disk.device.write.requests_server_cmaui_3_test_nested3: - test_nested3 - - scalable_server_cmaui - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.allocation_server_cmaui_test_nested3: + - disk.device.write.requests_server_cmaui_3 + binding_cmaui_port_311_test_nested3: - test_nested3 - - disk.device.allocation_server_cmaui - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage - network.outgoing.bytes.rate_cmaui_port_22: - - cmaui_port_22 - - network.outgoing.bytes.rate - attachment_cmaui_port_22_test_nested3: + - binding_cmaui_port_311 + disk.capacity_server_cmaui_3_test_nested3: - test_nested3 - - attachment_cmaui_port_22 - memory_server_cmaui_test_nested3: + - disk.capacity_server_cmaui_3 + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes + feature_server_cmaui_2: + - server_cmaui_2 + - feature + feature_cmaui_port_311_test_nested3: - test_nested3 - - memory_server_cmaui - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate - disk.device.read.requests_server_cmaui_test_nested3: + - feature_cmaui_port_311 + network.outgoing.packets.rate_cmaui_port_211: + - cmaui_port_211 + - network.outgoing.packets.rate + binding_cmaui_port_211: + - cmaui_port_211 + - binding + network.outgoing.bytes.rate_cmaui_port_211: + - cmaui_port_211 + - network.outgoing.bytes.rate + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + disk.device.read.requests_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.read.requests_server_cmaui - network.outpoing.packets_cmaui_port_22: - - cmaui_port_22 - - network.outpoing.packets - network.outgoing.bytes_cmaui_port_11_test_nested3: + - disk.device.read.requests_server_cmaui_3 + binding_server_cmaui_2: + - server_cmaui_2 + - binding + feature_test_nested3: - test_nested3 - - network.outgoing.bytes_cmaui_port_11 - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - disk.device.read.bytes.rate_server_cmaui_test_nested3: + - feature + vcpus_server_cmaui_2: + - server_cmaui_2 + - vcpus + feature_cmaui_port_222: + - cmaui_port_222 + - feature + network.incoming.bytes.rate_cmaui_port_211: + - cmaui_port_211 + - network.incoming.bytes.rate + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + os_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.read.bytes.rate_server_cmaui - disk.device.latency_server_cmaui_test_nested3: + - os_server_cmaui_3 + disk.write.requests_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.latency_server_cmaui - instance_server_cmaui_test_nested3: + - disk.write.requests_server_cmaui_3 + disk.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + network.incoming.bytes.rate_cmaui_port_311_test_nested3: - test_nested3 - - instance_server_cmaui - disk.device.write.bytes.rate_server_cmaui_test_nested3: + - network.incoming.bytes.rate_cmaui_port_311 + endpoint_server_cmaui_2: + - server_cmaui_2 + - endpoint + memory.resident_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.write.bytes.rate_server_cmaui - memory_server_cmaui: - - server_cmaui - - memory - feature_cmaui_port_22: - - cmaui_port_22 - - feature - disk.write.bytes.rate_server_cmaui_test_nested3: + - memory.resident_server_cmaui_3 + disk.allocation_server_cmaui_3_test_nested3: - test_nested3 - - disk.write.bytes.rate_server_cmaui - disk.device.usage_server_cmaui_test_nested3: + - disk.allocation_server_cmaui_3 + network.outgoing.bytes.rate_cmaui_port_311_test_nested3: - test_nested3 - - disk.device.usage_server_cmaui - binding_server_cmaui: - - server_cmaui + - network.outgoing.bytes.rate_cmaui_port_311 + network.outgoing.packets.rate_cmaui_port_222: + - cmaui_port_222 + - network.outgoing.packets.rate + binding_cmaui_port_222: + - cmaui_port_222 - binding - disk.iops_server_cmaui_test_nested3: + os_server_cmaui_2: + - server_cmaui_2 + - os + feature_cmaui_port_322_test_nested3: - test_nested3 - - disk.iops_server_cmaui - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes - network.outgoing.bytes.rate_cmaui_port_11: - - cmaui_port_11 + - feature_cmaui_port_322 + network.outgoing.bytes.rate_cmaui_port_222: + - cmaui_port_222 - network.outgoing.bytes.rate - feature_server_cmaui_test_nested3: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3: - test_nested3 - - feature_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested3: + - disk.device.read.bytes.rate_server_cmaui_3 + disk.device.write.requests.rate_server_cmaui_3_test_nested3: - test_nested3 - - disk.device.write.requests.rate_server_cmaui - network.outgoing.packets.rate_cmaui_port_11_test_nested3: + - disk.device.write.requests.rate_server_cmaui_3 + network.incoming.packets.rate_cmaui_port_222: + - cmaui_port_222 + - network.incoming.packets.rate + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation + network.outgoing.bytes_cmaui_port_322_test_nested3: - test_nested3 - - network.outgoing.packets.rate_cmaui_port_11 - disk.device.write.requests_server_cmaui_test_nested3: + - network.outgoing.bytes_cmaui_port_322 + host_server_cmaui_2: + - server_cmaui_2 + - host + network.outgoing.packets.rate_cmaui_port_322_test_nested3: - test_nested3 - - disk.device.write.requests_server_cmaui - network.incoming.packets_cmaui_port_22_test_nested3: + - network.outgoing.packets.rate_cmaui_port_322 + disk.iops_server_cmaui_3_test_nested3: - test_nested3 - - network.incoming.packets_cmaui_port_22 - network.incoming.bytes_cmaui_port_22_test_nested3: + - disk.iops_server_cmaui_3 + attachment_cmaui_port_311_test_nested3: - test_nested3 - - network.incoming.bytes_cmaui_port_22 - attachment_cmaui_port_22: - - cmaui_port_22 - - attachment - network.outgoing.bytes_cmaui_port_22_test_nested3: + - attachment_cmaui_port_311 + cpu_util_server_cmaui_3_test_nested3: - test_nested3 - - network.outgoing.bytes_cmaui_port_22 - network.incoming.packets_cmaui_port_22: - - cmaui_port_22 - - network.incoming.packets - memory.resident_server_cmaui: - - server_cmaui - - memory.resident - network.incoming.bytes_cmaui_port_22: - - cmaui_port_22 - - network.incoming.bytes - disk.device.iops_server_cmaui_test_nested3: + - cpu_util_server_cmaui_3 + network.outpoing.packets_cmaui_port_322_test_nested3: - test_nested3 - - disk.device.iops_server_cmaui - network.outgoing.bytes.rate_cmaui_port_22_test_nested3: + - network.outpoing.packets_cmaui_port_322 + instance_server_cmaui_2: + - server_cmaui_2 + - instance + disk.root.size_server_cmaui_3_test_nested3: - test_nested3 - - network.outgoing.bytes.rate_cmaui_port_22 - disk.root.size_server_cmaui_test_nested3: + - disk.root.size_server_cmaui_3 + vcpus_server_cmaui_3_test_nested3: - test_nested3 - - disk.root.size_server_cmaui - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - vcpus_server_cmaui: - - server_cmaui - - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests - network.outgoing.packets.rate_cmaui_port_11: - - cmaui_port_11 - - network.outgoing.packets.rate - binding_cmaui_port_11: - - cmaui_port_11 - - binding - cpu.delta_server_cmaui_test_nested3: + - vcpus_server_cmaui_3 + disk.ephemeral.size_server_cmaui_3_test_nested3: - test_nested3 - - cpu.delta_server_cmaui - network.outpoing.packets_cmaui_port_22_test_nested3: + - disk.ephemeral.size_server_cmaui_3 + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + network.incoming.packets_cmaui_port_322_test_nested3: - test_nested3 - - network.outpoing.packets_cmaui_port_22 - attachment_cmaui_port_11: - - cmaui_port_11 - - attachment - endpoint_server_cmaui: - - server_cmaui - - endpoint - feature_cmaui_port_11_test_nested3: + - network.incoming.packets_cmaui_port_322 + network.incoming.packets.rate_cmaui_port_322_test_nested3: - test_nested3 - - feature_cmaui_port_11 - network.incoming.packets_cmaui_port_11: - - cmaui_port_11 - - network.incoming.packets - network.incoming.bytes_cmaui_port_11: - - cmaui_port_11 - - network.incoming.bytes - disk.device.capacity_server_cmaui_test_nested3: + - network.incoming.packets.rate_cmaui_port_322 + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident + feature_cmaui_port_211: + - cmaui_port_211 + - feature + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency + network.incoming.bytes_cmaui_port_322_test_nested3: - test_nested3 - - disk.device.capacity_server_cmaui + - network.incoming.bytes_cmaui_port_322 + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage requirements: - dependency_server_cmaui: - - server_cmaui - - dependency - dependency_server_cmaui_test_nested3: + dependency_server_cmaui_3_test_nested3: - test_nested3 - - dependency_server_cmaui - dependency_cmaui_port_11_test_nested3: - - test_nested3 - - dependency_cmaui_port_11 - link_cmaui_port_22_test_nested3: - - test_nested3 - - link_cmaui_port_22 - dependency_cmaui_port_22_test_nested3: + - dependency_server_cmaui_3 + link_cmaui_port_211: + - cmaui_port_211 + - link + link_cmaui_port_222: + - cmaui_port_222 + - link + dependency_cmaui_port_311_test_nested3: - test_nested3 - - dependency_cmaui_port_22 - local_storage_server_cmaui_test_nested3: + - dependency_cmaui_port_311 + link_cmaui_port_322_test_nested3: - test_nested3 - - local_storage_server_cmaui - local_storage_server_cmaui: - - server_cmaui + - link_cmaui_port_322 + local_storage_server_cmaui_2: + - server_cmaui_2 - local_storage - link_cmaui_port_11: - - cmaui_port_11 - - link - link_cmaui_port_22: - - cmaui_port_22 - - link - dependency_cmaui_port_11: - - cmaui_port_11 + dependency_cmaui_port_211: + - cmaui_port_211 - dependency - dependency_cmaui_port_22: - - cmaui_port_22 + dependency_cmaui_port_222: + - cmaui_port_222 - dependency + link_cmaui_port_311_test_nested3: + - test_nested3 + - link_cmaui_port_311 dependency_test_nested3: - test_nested3 - dependency - link_cmaui_port_11_test_nested3: + local_storage_server_cmaui_3_test_nested3: + - test_nested3 + - local_storage_server_cmaui_3 + dependency_cmaui_port_322_test_nested3: - test_nested3 - - link_cmaui_port_11
\ No newline at end of file + - dependency_cmaui_port_322 + dependency_server_cmaui_2: + - server_cmaui_2 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml index 1e2f187bff..ae64c41e8c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml @@ -55,7 +55,20 @@ topology_template: type: string description: UID of OAM network node_templates: - cmaui_port_11: + server_cmaui_3: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + name: + get_input: + - cmaui_names + - 0 + cmaui_port_311: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -81,9 +94,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo - cmaui_port_22: + cmaui_port_322: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -108,21 +121,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 groups: nested3level_group: type: org.openecomp.groups.heat.HeatStack @@ -130,217 +130,217 @@ topology_template: heat_file: ../Artifacts/nested3level.yml description: cmaui server template for vMMSC members: - - cmaui_port_11 - - cmaui_port_22 - - server_cmaui + - server_cmaui_3 + - cmaui_port_311 + - cmaui_port_322 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3level capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation - network.outpoing.packets_cmaui_port_11: - - cmaui_port_11 - - network.outpoing.packets - network.outgoing.packets.rate_cmaui_port_22: - - cmaui_port_22 - - network.outgoing.packets.rate - binding_cmaui_port_22: - - cmaui_port_22 + disk.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes + feature_server_cmaui_3: + - server_cmaui_3 + - feature + disk.device.usage_server_cmaui_3: + - server_cmaui_3 + - disk.device.usage + disk.device.latency_server_cmaui_3: + - server_cmaui_3 + - disk.device.latency + disk.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes + disk.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.allocation + network.outgoing.bytes_cmaui_port_311: + - cmaui_port_311 + - network.outgoing.bytes + binding_server_cmaui_3: + - server_cmaui_3 - binding - scalable_server_cmaui: - - server_cmaui + vcpus_server_cmaui_3: + - server_cmaui_3 + - vcpus + disk.root.size_server_cmaui_3: + - server_cmaui_3 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests.rate + scalable_server_cmaui_3: + - server_cmaui_3 - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - cpu_server_cmaui: - - server_cmaui - - cpu - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util - network.incoming.packets.rate_cmaui_port_22: - - cmaui_port_22 + network.incoming.packets.rate_cmaui_port_311: + - cmaui_port_311 - network.incoming.packets.rate - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests - disk.read.requests_server_cmaui: - - server_cmaui + disk.read.requests_server_cmaui_3: + - server_cmaui_3 - disk.read.requests - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - disk.usage_server_cmaui: - - server_cmaui + disk.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests + disk.usage_server_cmaui_3: + - server_cmaui_3 - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage - network.outgoing.bytes.rate_cmaui_port_22: - - cmaui_port_22 - - network.outgoing.bytes.rate - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate - network.outpoing.packets_cmaui_port_22: - - cmaui_port_22 + network.incoming.bytes_cmaui_port_311: + - cmaui_port_311 + - network.incoming.bytes + attachment_cmaui_port_311: + - cmaui_port_311 + - attachment + disk.device.iops_server_cmaui_3: + - server_cmaui_3 + - disk.device.iops + disk.device.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.device.capacity + network.outpoing.packets_cmaui_port_311: + - cmaui_port_311 - network.outpoing.packets - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui - - disk.device.read.bytes - memory_server_cmaui: - - server_cmaui - - memory - feature_cmaui_port_22: - - cmaui_port_22 + network.incoming.packets_cmaui_port_322: + - cmaui_port_322 + - network.incoming.packets + disk.device.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes.rate + endpoint_server_cmaui_3: + - server_cmaui_3 + - endpoint + disk.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes + network.outgoing.bytes_cmaui_port_322: + - cmaui_port_322 + - network.outgoing.bytes + os_server_cmaui_3: + - server_cmaui_3 + - os + disk.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests.rate + feature_cmaui_port_311: + - cmaui_port_311 - feature - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size - network.incoming.bytes.rate_cmaui_port_22: - - cmaui_port_22 + network.incoming.bytes.rate_cmaui_port_322: + - cmaui_port_322 - network.incoming.bytes.rate - binding_server_cmaui: - - server_cmaui + disk.device.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes + memory_server_cmaui_3: + - server_cmaui_3 + - memory + disk.device.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.device.allocation + cpu_server_cmaui_3: + - server_cmaui_3 + - cpu + network.incoming.bytes_cmaui_port_322: + - cmaui_port_322 + - network.incoming.bytes + host_server_cmaui_3: + - server_cmaui_3 + - host + attachment_cmaui_port_322: + - cmaui_port_322 + - attachment + network.incoming.packets_cmaui_port_311: + - cmaui_port_311 + - network.incoming.packets + network.outpoing.packets_cmaui_port_322: + - cmaui_port_322 + - network.outpoing.packets + disk.ephemeral.size_server_cmaui_3: + - server_cmaui_3 + - disk.ephemeral.size + disk.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.capacity + network.outgoing.packets.rate_cmaui_port_311: + - cmaui_port_311 + - network.outgoing.packets.rate + binding_cmaui_port_311: + - cmaui_port_311 - binding - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate - network.outgoing.bytes.rate_cmaui_port_11: - - cmaui_port_11 + network.outgoing.bytes.rate_cmaui_port_311: + - cmaui_port_311 - network.outgoing.bytes.rate - feature_cmaui_port_11: - - cmaui_port_11 + instance_server_cmaui_3: + - server_cmaui_3 + - instance + feature_cmaui_port_322: + - cmaui_port_322 - feature - attachment_cmaui_port_22: - - cmaui_port_22 - - attachment - network.incoming.bytes.rate_cmaui_port_11: - - cmaui_port_11 + network.incoming.bytes.rate_cmaui_port_311: + - cmaui_port_311 - network.incoming.bytes.rate - network.outgoing.bytes_cmaui_port_11: - - cmaui_port_11 - - network.outgoing.bytes - network.incoming.packets_cmaui_port_22: - - cmaui_port_22 - - network.incoming.packets - memory.resident_server_cmaui: - - server_cmaui - - memory.resident - network.incoming.bytes_cmaui_port_22: - - cmaui_port_22 - - network.incoming.bytes - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - feature_server_cmaui: - - server_cmaui - - feature - vcpus_server_cmaui: - - server_cmaui - - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests - network.outgoing.packets.rate_cmaui_port_11: - - cmaui_port_11 + disk.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes.rate + disk.device.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests + disk.iops_server_cmaui_3: + - server_cmaui_3 + - disk.iops + disk.device.read.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests + disk.device.read.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests.rate + network.outgoing.packets.rate_cmaui_port_322: + - cmaui_port_322 - network.outgoing.packets.rate - binding_cmaui_port_11: - - cmaui_port_11 + binding_cmaui_port_322: + - cmaui_port_322 - binding - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size - attachment_cmaui_port_11: - - cmaui_port_11 - - attachment - network.incoming.packets.rate_cmaui_port_11: - - cmaui_port_11 + cpu.delta_server_cmaui_3: + - server_cmaui_3 + - cpu.delta + memory.resident_server_cmaui_3: + - server_cmaui_3 + - memory.resident + network.outgoing.bytes.rate_cmaui_port_322: + - cmaui_port_322 + - network.outgoing.bytes.rate + disk.latency_server_cmaui_3: + - server_cmaui_3 + - disk.latency + network.incoming.packets.rate_cmaui_port_322: + - cmaui_port_322 - network.incoming.packets.rate - endpoint_server_cmaui: - - server_cmaui - - endpoint - network.outgoing.bytes_cmaui_port_22: - - cmaui_port_22 - - network.outgoing.bytes - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - network.incoming.packets_cmaui_port_11: - - cmaui_port_11 - - network.incoming.packets - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops - network.incoming.bytes_cmaui_port_11: - - cmaui_port_11 - - network.incoming.bytes - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes + memory.usage_server_cmaui_3: + - server_cmaui_3 + - memory.usage + cpu_util_server_cmaui_3: + - server_cmaui_3 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes.rate requirements: - dependency_server_cmaui: - - server_cmaui - - dependency - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_cmaui_port_11: - - cmaui_port_11 + link_cmaui_port_311: + - cmaui_port_311 - link - link_cmaui_port_22: - - cmaui_port_22 + link_cmaui_port_322: + - cmaui_port_322 - link - dependency_cmaui_port_11: - - cmaui_port_11 + dependency_server_cmaui_3: + - server_cmaui_3 + - dependency + local_storage_server_cmaui_3: + - server_cmaui_3 + - local_storage + dependency_cmaui_port_311: + - cmaui_port_311 - dependency - dependency_cmaui_port_22: - - cmaui_port_22 + dependency_cmaui_port_322: + - cmaui_port_322 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml index 8b1dfeb095..59c7bc8292 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml @@ -80,20 +80,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo - test_nested2: - type: org.openecomp.resource.abstract.nodes.heat.nested2level - directives: - - substitutable - properties: - service_template_filter: - substitute_service_template: nested2levelServiceTemplate.yaml - p2: - get_input: p2 - shared_security_group_id1: - get_input: shared_security_group_id1 - server_cmaui: + server_cmaui_1: type: org.openecomp.resource.vfc.nodes.heat.cmaui properties: flavor: @@ -106,6 +95,17 @@ topology_template: get_input: - cmaui_names - 0 + test_nested2: + type: org.openecomp.resource.abstract.nodes.heat.nested2level + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested2levelServiceTemplate.yaml + p2: + get_input: p2 + shared_security_group_id1: + get_input: shared_security_group_id1 cmaui_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -132,7 +132,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo groups: nested_group: @@ -142,643 +142,643 @@ topology_template: description: cmaui server template for vMMSC members: - cmaui_port_2 + - server_cmaui_1 - test_nested2 - - server_cmaui - cmaui_port_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate - network.incoming.packets.rate_cmaui_port_22_test_nested2: + disk.iops_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.packets.rate_cmaui_port_22 - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation - disk.device.read.bytes_server_cmaui_test_nested3_test_nested2: + - disk.iops_server_cmaui_3_test_nested3 + network.outpoing.packets_cmaui_port_222_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_222 + disk.device.usage_server_cmaui_1: + - server_cmaui_1 + - disk.device.usage + memory.usage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.read.bytes_server_cmaui_test_nested3 + - memory.usage_server_cmaui_3_test_nested3 feature_test_nested3_test_nested2: - test_nested2 - feature_test_nested3 - disk.write.requests.rate_server_cmaui_test_nested2: + disk.device.latency_server_cmaui_1: + - server_cmaui_1 + - disk.device.latency + disk.device.usage_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.requests.rate_server_cmaui - disk.capacity_server_cmaui_test_nested2: + - disk.device.usage_server_cmaui_2 + host_server_cmaui_2_test_nested2: - test_nested2 - - disk.capacity_server_cmaui - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - disk.latency_server_cmaui_test_nested2: + - host_server_cmaui_2 + disk.root.size_server_cmaui_2_test_nested2: - test_nested2 - - disk.latency_server_cmaui - disk.read.bytes.rate_server_cmaui_test_nested2: + - disk.root.size_server_cmaui_2 + endpoint_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.read.bytes.rate_server_cmaui - memory_server_cmaui_test_nested3_test_nested2: + - endpoint_server_cmaui_3_test_nested3 + feature_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - memory_server_cmaui_test_nested3 - instance_server_cmaui_test_nested3_test_nested2: + - feature_cmaui_port_311_test_nested3 + memory_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - instance_server_cmaui_test_nested3 - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util - binding_cmaui_port_11_test_nested2: + - memory_server_cmaui_3_test_nested3 + network.outgoing.bytes_cmaui_port_222_test_nested2: - test_nested2 - - binding_cmaui_port_11 - endpoint_server_cmaui_test_nested2: + - network.outgoing.bytes_cmaui_port_222 + disk.device.write.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - - endpoint_server_cmaui - disk.device.read.bytes_server_cmaui_test_nested2: + - disk.device.write.bytes.rate_server_cmaui_2 + feature_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - disk.device.read.bytes_server_cmaui - feature_cmaui_port_11_test_nested3_test_nested2: + - feature_cmaui_port_322_test_nested3 + binding_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - feature_cmaui_port_11_test_nested3 - feature_cmaui_port_22_test_nested3_test_nested2: + - binding_cmaui_port_322_test_nested3 + disk.root.size_server_cmaui_1: + - server_cmaui_1 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests.rate + network.outpoing.packets_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - feature_cmaui_port_22_test_nested3 - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests + - network.outpoing.packets_cmaui_port_311_test_nested3 + binding_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - binding_cmaui_port_311_test_nested3 + network.outpoing.packets_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.outpoing.packets_cmaui_port_322_test_nested3 + disk.write.bytes.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.write.bytes.rate_server_cmaui_2 + disk.iops_server_cmaui_2_test_nested2: + - test_nested2 + - disk.iops_server_cmaui_2 + network.outgoing.packets.rate_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_322_test_nested3 network.outgoing.bytes_cmaui_port_2: - cmaui_port_2 - network.outgoing.bytes + disk.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.read.requests + network.outgoing.packets.rate_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_311_test_nested3 + network.outgoing.packets.rate_cmaui_port_222_test_nested2: + - test_nested2 + - network.outgoing.packets.rate_cmaui_port_222 network.outgoing.bytes_cmaui_port_1: - cmaui_port_1 - network.outgoing.bytes - memory.usage_server_cmaui_test_nested2: + cpu.delta_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - memory.usage_server_cmaui - network.outpoing.packets_cmaui_port_11_test_nested3_test_nested2: + - cpu.delta_server_cmaui_3_test_nested3 + disk.device.iops_server_cmaui_1: + - server_cmaui_1 + - disk.device.iops + network.incoming.packets_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - network.outpoing.packets_cmaui_port_11_test_nested3 - disk.device.iops_server_cmaui_test_nested3_test_nested2: + - network.incoming.packets_cmaui_port_311_test_nested3 + disk.device.allocation_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.iops_server_cmaui_test_nested3 - network.incoming.packets.rate_cmaui_port_11_test_nested2: + - disk.device.allocation_server_cmaui_3_test_nested3 + disk.latency_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.packets.rate_cmaui_port_11 - disk.device.read.requests_server_cmaui_test_nested3_test_nested2: + - disk.latency_server_cmaui_3_test_nested3 + disk.allocation_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.read.requests_server_cmaui_test_nested3 - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui + - disk.allocation_server_cmaui_2 + disk.device.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.bytes.rate + disk.read.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes + host_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - host_server_cmaui_3_test_nested3 + disk.device.read.bytes_server_cmaui_1: + - server_cmaui_1 - disk.device.read.bytes - cpu_util_server_cmaui_test_nested3_test_nested2: + cpu_server_cmaui_2_test_nested2: - test_nested2 - - cpu_util_server_cmaui_test_nested3 - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size - network.outgoing.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + - cpu_server_cmaui_2 + disk.device.read.bytes.rate_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.read.bytes.rate_server_cmaui_2 + disk.device.read.bytes_server_cmaui_2_test_nested2: - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_22_test_nested3 - binding_cmaui_port_22_test_nested2: + - disk.device.read.bytes_server_cmaui_2 + disk.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests.rate + network.outgoing.packets.rate_cmaui_port_211_test_nested2: - test_nested2 - - binding_cmaui_port_22 - disk.allocation_server_cmaui_test_nested3_test_nested2: + - network.outgoing.packets.rate_cmaui_port_211 + endpoint_server_cmaui_2_test_nested2: - test_nested2 - - disk.allocation_server_cmaui_test_nested3 - binding_server_cmaui_test_nested2: + - endpoint_server_cmaui_2 + disk.device.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - binding_server_cmaui - disk.capacity_server_cmaui_test_nested3_test_nested2: + - disk.device.read.bytes.rate_server_cmaui_3_test_nested3 + cpu.delta_server_cmaui_2_test_nested2: - test_nested2 - - disk.capacity_server_cmaui_test_nested3 - os_server_cmaui_test_nested3_test_nested2: + - cpu.delta_server_cmaui_2 + instance_server_cmaui_2_test_nested2: + - test_nested2 + - instance_server_cmaui_2 + cpu_server_cmaui_1: + - server_cmaui_1 + - cpu + network.incoming.packets.rate_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - os_server_cmaui_test_nested3 + - network.incoming.packets.rate_cmaui_port_311_test_nested3 + feature_cmaui_port_211_test_nested2: + - test_nested2 + - feature_cmaui_port_211 network.incoming.packets_cmaui_port_2: - cmaui_port_2 - network.incoming.packets - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate - binding_server_cmaui_test_nested3_test_nested2: + memory.usage_server_cmaui_2_test_nested2: - test_nested2 - - binding_server_cmaui_test_nested3 - disk.ephemeral.size_server_cmaui_test_nested3_test_nested2: + - memory.usage_server_cmaui_2 + disk.write.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.ephemeral.size_server_cmaui_test_nested3 - disk.write.requests.rate_server_cmaui_test_nested3_test_nested2: + - disk.write.requests.rate_server_cmaui_2 + disk.capacity_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.write.requests.rate_server_cmaui_test_nested3 - disk.allocation_server_cmaui_test_nested2: - - test_nested2 - - disk.allocation_server_cmaui + - disk.capacity_server_cmaui_3_test_nested3 network.incoming.packets_cmaui_port_1: - cmaui_port_1 - network.incoming.packets - network.outgoing.bytes_cmaui_port_11_test_nested3_test_nested2: + disk.device.write.bytes_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.write.bytes_server_cmaui_2 + disk.write.requests_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.outgoing.bytes_cmaui_port_11_test_nested3 - network.incoming.bytes.rate_cmaui_port_22_test_nested2: + - disk.write.requests_server_cmaui_3_test_nested3 + disk.ephemeral.size_server_cmaui_1: + - server_cmaui_1 + - disk.ephemeral.size + disk.capacity_server_cmaui_2_test_nested2: - test_nested2 - - network.incoming.bytes.rate_cmaui_port_22 - disk.read.requests_server_cmaui_test_nested2: + - disk.capacity_server_cmaui_2 + disk.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.capacity + disk.device.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.read.requests_server_cmaui - network.outgoing.bytes_cmaui_port_22_test_nested3_test_nested2: + - disk.device.write.requests.rate_server_cmaui_3_test_nested3 + disk.latency_server_cmaui_2_test_nested2: - test_nested2 - - network.outgoing.bytes_cmaui_port_22_test_nested3 - disk.write.requests_server_cmaui_test_nested2: + - disk.latency_server_cmaui_2 + disk.read.bytes.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.requests_server_cmaui - network.outpoing.packets_cmaui_port_11_test_nested2: + - disk.read.bytes.rate_server_cmaui_2 + network.incoming.bytes.rate_cmaui_port_211_test_nested2: - test_nested2 - - network.outpoing.packets_cmaui_port_11 - os_server_cmaui_test_nested2: + - network.incoming.bytes.rate_cmaui_port_211 + disk.ephemeral.size_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - os_server_cmaui - feature_cmaui_port_22_test_nested2: + - disk.ephemeral.size_server_cmaui_3_test_nested3 + disk.device.read.requests_server_cmaui_2_test_nested2: - test_nested2 - - feature_cmaui_port_22 - cpu_util_server_cmaui_test_nested2: + - disk.device.read.requests_server_cmaui_2 + binding_cmaui_port_211_test_nested2: - test_nested2 - - cpu_util_server_cmaui - feature_server_cmaui: - - server_cmaui - - feature + - binding_cmaui_port_211 + binding_server_cmaui_2_test_nested2: + - test_nested2 + - binding_server_cmaui_2 + os_server_cmaui_2_test_nested2: + - test_nested2 + - os_server_cmaui_2 + attachment_cmaui_port_211_test_nested2: + - test_nested2 + - attachment_cmaui_port_211 binding_cmaui_port_1: - cmaui_port_1 - binding binding_cmaui_port_2: - cmaui_port_2 - binding - disk.iops_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.iops_server_cmaui_test_nested3 - disk.device.allocation_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.device.allocation_server_cmaui_test_nested3 - network.outpoing.packets_cmaui_port_22_test_nested3_test_nested2: - - test_nested2 - - network.outpoing.packets_cmaui_port_22_test_nested3 - network.incoming.packets.rate_cmaui_port_22_test_nested3_test_nested2: - - test_nested2 - - network.incoming.packets.rate_cmaui_port_22_test_nested3 - disk.write.bytes_server_cmaui_test_nested2: - - test_nested2 - - disk.write.bytes_server_cmaui - network.incoming.packets_cmaui_port_22_test_nested3_test_nested2: + disk.ephemeral.size_server_cmaui_2_test_nested2: - test_nested2 - - network.incoming.packets_cmaui_port_22_test_nested3 - vcpus_server_cmaui_test_nested2: + - disk.ephemeral.size_server_cmaui_2 + disk.iops_server_cmaui_1: + - server_cmaui_1 + - disk.iops + vcpus_server_cmaui_2_test_nested2: - test_nested2 - - vcpus_server_cmaui - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size - disk.root.size_server_cmaui_test_nested3_test_nested2: + - vcpus_server_cmaui_2 + binding_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.root.size_server_cmaui_test_nested3 + - binding_server_cmaui_3_test_nested3 + disk.device.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests network.outgoing.bytes.rate_cmaui_port_2: - cmaui_port_2 - network.outgoing.bytes.rate - disk.device.write.requests.rate_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.device.write.requests.rate_server_cmaui_test_nested3 - cpu_server_cmaui_test_nested2: - - test_nested2 - - cpu_server_cmaui - memory.resident_server_cmaui_test_nested2: - - test_nested2 - - memory.resident_server_cmaui - cpu_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - cpu_server_cmaui_test_nested3 - network.outgoing.packets.rate_cmaui_port_22_test_nested2: - - test_nested2 - - network.outgoing.packets.rate_cmaui_port_22 + disk.device.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes.rate + cpu_util_server_cmaui_1: + - server_cmaui_1 + - cpu_util network.outgoing.bytes.rate_cmaui_port_1: - cmaui_port_1 - network.outgoing.bytes.rate - disk.write.requests_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.write.requests_server_cmaui_test_nested3 - disk.device.latency_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.device.latency_server_cmaui_test_nested3 - network.outgoing.bytes.rate_cmaui_port_11_test_nested2: - - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_11 - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - host_server_cmaui_test_nested2: + network.outgoing.bytes_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - host_server_cmaui - disk.usage_server_cmaui_test_nested2: - - test_nested2 - - disk.usage_server_cmaui - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops + - network.outgoing.bytes_cmaui_port_322_test_nested3 network.incoming.bytes_cmaui_port_2: - cmaui_port_2 - network.incoming.bytes - network.incoming.bytes.rate_cmaui_port_11_test_nested3_test_nested2: - - test_nested2 - - network.incoming.bytes.rate_cmaui_port_11_test_nested3 - disk.read.bytes_server_cmaui_test_nested3_test_nested2: + cpu_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.read.bytes_server_cmaui_test_nested3 - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes + - cpu_server_cmaui_3_test_nested3 network.incoming.bytes_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes - disk.write.bytes.rate_server_cmaui_test_nested3_test_nested2: + network.incoming.packets_cmaui_port_222_test_nested2: - test_nested2 - - disk.write.bytes.rate_server_cmaui_test_nested3 - binding_cmaui_port_22_test_nested3_test_nested2: + - network.incoming.packets_cmaui_port_222 + network.incoming.packets.rate_cmaui_port_222_test_nested2: - test_nested2 - - binding_cmaui_port_22_test_nested3 - disk.ephemeral.size_server_cmaui_test_nested2: + - network.incoming.packets.rate_cmaui_port_222 + network.incoming.packets.rate_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - disk.ephemeral.size_server_cmaui - binding_cmaui_port_11_test_nested3_test_nested2: + - network.incoming.packets.rate_cmaui_port_322_test_nested3 + network.incoming.bytes.rate_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - binding_cmaui_port_11_test_nested3 - disk.read.requests_server_cmaui_test_nested3_test_nested2: + - network.incoming.bytes.rate_cmaui_port_311_test_nested3 + network.outgoing.bytes.rate_cmaui_port_222_test_nested2: - test_nested2 - - disk.read.requests_server_cmaui_test_nested3 - scalable_server_cmaui_test_nested3_test_nested2: + - network.outgoing.bytes.rate_cmaui_port_222 + network.incoming.bytes.rate_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - scalable_server_cmaui_test_nested3 - network.incoming.packets_cmaui_port_11_test_nested2: + - network.incoming.bytes.rate_cmaui_port_322_test_nested3 + disk.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes + disk.read.bytes_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.packets_cmaui_port_11 - network.incoming.bytes_cmaui_port_11_test_nested2: + - disk.read.bytes_server_cmaui_3_test_nested3 + memory.resident_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.bytes_cmaui_port_11 - vcpus_server_cmaui_test_nested3_test_nested2: + - memory.resident_server_cmaui_3_test_nested3 + disk.device.latency_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - vcpus_server_cmaui_test_nested3 - host_server_cmaui_test_nested3_test_nested2: + - disk.device.latency_server_cmaui_3_test_nested3 + attachment_cmaui_port_222_test_nested2: - test_nested2 - - host_server_cmaui_test_nested3 - disk.device.read.requests.rate_server_cmaui_test_nested2: + - attachment_cmaui_port_222 + network.incoming.bytes_cmaui_port_222_test_nested2: - test_nested2 - - disk.device.read.requests.rate_server_cmaui + - network.incoming.bytes_cmaui_port_222 network.incoming.packets.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.packets.rate network.incoming.packets.rate_cmaui_port_2: - cmaui_port_2 - network.incoming.packets.rate - cpu_server_cmaui: - - server_cmaui - - cpu + feature_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - feature_server_cmaui_3_test_nested3 + network.incoming.bytes.rate_cmaui_port_222_test_nested2: + - test_nested2 + - network.incoming.bytes.rate_cmaui_port_222 + attachment_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - attachment_cmaui_port_311_test_nested3 feature_cmaui_port_1: - cmaui_port_1 - feature feature_cmaui_port_2: - cmaui_port_2 - feature - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - network.outgoing.packets.rate_cmaui_port_22_test_nested3_test_nested2: + disk.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes + feature_server_cmaui_1: + - server_cmaui_1 + - feature + disk.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.allocation + attachment_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - network.outgoing.packets.rate_cmaui_port_22_test_nested3 - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - network.outgoing.packets.rate_cmaui_port_11_test_nested3_test_nested2: + - attachment_cmaui_port_322_test_nested3 + disk.device.capacity_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.capacity_server_cmaui_3_test_nested3 + cpu_util_server_cmaui_2_test_nested2: - test_nested2 - - network.outgoing.packets.rate_cmaui_port_11_test_nested3 - disk.device.write.bytes_server_cmaui_test_nested2: + - cpu_util_server_cmaui_2 + network.incoming.packets_cmaui_port_211_test_nested2: - test_nested2 - - disk.device.write.bytes_server_cmaui - network.incoming.bytes.rate_cmaui_port_11_test_nested2: + - network.incoming.packets_cmaui_port_211 + disk.device.iops_server_cmaui_2_test_nested2: - test_nested2 - - network.incoming.bytes.rate_cmaui_port_11 + - disk.device.iops_server_cmaui_2 + binding_server_cmaui_1: + - server_cmaui_1 + - binding + network.incoming.bytes_cmaui_port_311_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_311_test_nested3 + scalable_server_cmaui_2_test_nested2: + - test_nested2 + - scalable_server_cmaui_2 + network.incoming.bytes_cmaui_port_322_test_nested3_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_322_test_nested3 attachment_cmaui_port_2: - cmaui_port_2 - attachment - scalable_server_cmaui_test_nested2: - - test_nested2 - - scalable_server_cmaui feature_test_nested2: - test_nested2 - feature - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests - attachment_cmaui_port_22_test_nested2: + scalable_server_cmaui_1: + - server_cmaui_1 + - scalable + disk.device.read.requests.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_22 - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity + - disk.device.read.requests.rate_server_cmaui_3_test_nested3 network.outgoing.packets.rate_cmaui_port_1: - cmaui_port_1 - network.outgoing.packets.rate network.outgoing.packets.rate_cmaui_port_2: - cmaui_port_2 - network.outgoing.packets.rate - disk.device.allocation_server_cmaui_test_nested2: - - test_nested2 - - disk.device.allocation_server_cmaui - disk.read.bytes_server_cmaui_test_nested2: - - test_nested2 - - disk.read.bytes_server_cmaui - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage attachment_cmaui_port_1: - cmaui_port_1 - attachment - memory_server_cmaui_test_nested2: + disk.device.usage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - memory_server_cmaui - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate - network.incoming.packets_cmaui_port_11_test_nested3_test_nested2: + - disk.device.usage_server_cmaui_3_test_nested3 + disk.write.requests_server_cmaui_2_test_nested2: - test_nested2 - - network.incoming.packets_cmaui_port_11_test_nested3 - disk.device.read.requests_server_cmaui_test_nested2: + - disk.write.requests_server_cmaui_2 + disk.root.size_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.read.requests_server_cmaui - network.incoming.bytes.rate_cmaui_port_22_test_nested3_test_nested2: + - disk.root.size_server_cmaui_3_test_nested3 + disk.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests + disk.device.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.bytes.rate_cmaui_port_22_test_nested3 - disk.device.read.bytes.rate_server_cmaui_test_nested2: + - disk.device.write.bytes.rate_server_cmaui_3_test_nested3 + disk.usage_server_cmaui_1: + - server_cmaui_1 + - disk.usage + feature_cmaui_port_222_test_nested2: - test_nested2 - - disk.device.read.bytes.rate_server_cmaui - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - disk.usage_server_cmaui_test_nested3_test_nested2: + - feature_cmaui_port_222 + disk.read.requests_server_cmaui_2_test_nested2: - test_nested2 - - disk.usage_server_cmaui_test_nested3 - disk.device.latency_server_cmaui_test_nested2: + - disk.read.requests_server_cmaui_2 + endpoint_server_cmaui_1: + - server_cmaui_1 + - endpoint + disk.device.capacity_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.latency_server_cmaui - network.outgoing.bytes_cmaui_port_11_test_nested2: + - disk.device.capacity_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - network.outgoing.bytes_cmaui_port_11 - disk.latency_server_cmaui_test_nested3_test_nested2: + - disk.device.read.requests.rate_server_cmaui_2 + memory.resident_server_cmaui_2_test_nested2: - test_nested2 - - disk.latency_server_cmaui_test_nested3 - disk.device.write.bytes.rate_server_cmaui_test_nested2: + - memory.resident_server_cmaui_2 + disk.usage_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.write.bytes.rate_server_cmaui - instance_server_cmaui_test_nested2: + - disk.usage_server_cmaui_2 + disk.device.read.requests_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - instance_server_cmaui - memory_server_cmaui: - - server_cmaui - - memory - attachment_cmaui_port_11_test_nested3_test_nested2: + - disk.device.read.requests_server_cmaui_3_test_nested3 + os_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_11_test_nested3 - network.incoming.bytes_cmaui_port_22_test_nested3_test_nested2: + - os_server_cmaui_3_test_nested3 + os_server_cmaui_1: + - server_cmaui_1 + - os + network.outgoing.bytes.rate_cmaui_port_211_test_nested2: - test_nested2 - - network.incoming.bytes_cmaui_port_22_test_nested3 - disk.write.bytes.rate_server_cmaui_test_nested2: + - network.outgoing.bytes.rate_cmaui_port_211 + disk.device.write.requests.rate_server_cmaui_2_test_nested2: - test_nested2 - - disk.write.bytes.rate_server_cmaui - disk.device.usage_server_cmaui_test_nested2: + - disk.device.write.requests.rate_server_cmaui_2 + feature_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.usage_server_cmaui - binding_server_cmaui: - - server_cmaui - - binding - disk.iops_server_cmaui_test_nested2: + - feature_server_cmaui_2 + memory_server_cmaui_2_test_nested2: - test_nested2 - - disk.iops_server_cmaui - memory.usage_server_cmaui_test_nested3_test_nested2: + - memory_server_cmaui_2 + disk.device.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.device.allocation + network.outgoing.bytes_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - memory.usage_server_cmaui_test_nested3 - disk.device.write.bytes_server_cmaui_test_nested3_test_nested2: + - network.outgoing.bytes_cmaui_port_311_test_nested3 + disk.write.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.write.bytes_server_cmaui_test_nested3 - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - network.incoming.packets.rate_cmaui_port_11_test_nested3_test_nested2: + - disk.write.bytes.rate_server_cmaui_3_test_nested3 + memory_server_cmaui_1: + - server_cmaui_1 + - memory + disk.device.iops_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.incoming.packets.rate_cmaui_port_11_test_nested3 - feature_server_cmaui_test_nested2: + - disk.device.iops_server_cmaui_3_test_nested3 + disk.device.write.requests_server_cmaui_2_test_nested2: - test_nested2 - - feature_server_cmaui - disk.write.bytes_server_cmaui_test_nested3_test_nested2: + - disk.device.write.requests_server_cmaui_2 + host_server_cmaui_1: + - server_cmaui_1 + - host + network.incoming.packets.rate_cmaui_port_211_test_nested2: - test_nested2 - - disk.write.bytes_server_cmaui_test_nested3 - disk.device.read.requests.rate_server_cmaui_test_nested3_test_nested2: + - network.incoming.packets.rate_cmaui_port_211 + disk.read.bytes_server_cmaui_2_test_nested2: - test_nested2 - - disk.device.read.requests.rate_server_cmaui_test_nested3 - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes - disk.device.iops_server_cmaui_test_nested2: + - disk.read.bytes_server_cmaui_2 + disk.allocation_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.iops_server_cmaui - disk.device.write.requests.rate_server_cmaui_test_nested2: + - disk.allocation_server_cmaui_3_test_nested3 + vcpus_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.write.requests.rate_server_cmaui - network.outgoing.packets.rate_cmaui_port_11_test_nested2: + - vcpus_server_cmaui_3_test_nested3 + network.outgoing.bytes_cmaui_port_211_test_nested2: - test_nested2 - - network.outgoing.packets.rate_cmaui_port_11 - feature_server_cmaui_test_nested3_test_nested2: + - network.outgoing.bytes_cmaui_port_211 + disk.device.write.requests_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - feature_server_cmaui_test_nested3 - disk.device.capacity_server_cmaui_test_nested3_test_nested2: + - disk.device.write.requests_server_cmaui_3_test_nested3 + disk.read.requests_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.capacity_server_cmaui_test_nested3 - attachment_cmaui_port_22_test_nested3_test_nested2: + - disk.read.requests_server_cmaui_3_test_nested3 + instance_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - attachment_cmaui_port_22_test_nested3 - disk.device.write.requests_server_cmaui_test_nested2: + - instance_server_cmaui_3_test_nested3 + disk.write.requests.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.write.requests_server_cmaui - network.outgoing.bytes_cmaui_port_22_test_nested2: + - disk.write.requests.rate_server_cmaui_3_test_nested3 + network.outgoing.bytes.rate_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - network.outgoing.bytes_cmaui_port_22 - cpu.delta_server_cmaui_test_nested3_test_nested2: + - network.outgoing.bytes.rate_cmaui_port_311_test_nested3 + disk.device.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.device.capacity + disk.device.latency_server_cmaui_2_test_nested2: - test_nested2 - - cpu.delta_server_cmaui_test_nested3 - endpoint_server_cmaui_test_nested3_test_nested2: + - disk.device.latency_server_cmaui_2 + disk.usage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - endpoint_server_cmaui_test_nested3 - memory.resident_server_cmaui: - - server_cmaui - - memory.resident - disk.device.write.bytes.rate_server_cmaui_test_nested3_test_nested2: + - disk.usage_server_cmaui_3_test_nested3 + network.outgoing.bytes.rate_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - disk.device.write.bytes.rate_server_cmaui_test_nested3 - disk.device.usage_server_cmaui_test_nested3_test_nested2: + - network.outgoing.bytes.rate_cmaui_port_322_test_nested3 + disk.device.read.bytes_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.usage_server_cmaui_test_nested3 - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - vcpus_server_cmaui: - - server_cmaui - - vcpus - network.outgoing.bytes.rate_cmaui_port_22_test_nested2: + - disk.device.read.bytes_server_cmaui_3_test_nested3 + network.outpoing.packets_cmaui_port_211_test_nested2: - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_22 - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes + - network.outpoing.packets_cmaui_port_211 + disk.device.write.bytes_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - disk.device.write.bytes_server_cmaui_3_test_nested3 + disk.device.allocation_server_cmaui_2_test_nested2: + - test_nested2 + - disk.device.allocation_server_cmaui_2 + instance_server_cmaui_1: + - server_cmaui_1 + - instance + disk.device.read.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests.rate + network.incoming.bytes_cmaui_port_211_test_nested2: + - test_nested2 + - network.incoming.bytes_cmaui_port_211 + binding_cmaui_port_222_test_nested2: + - test_nested2 + - binding_cmaui_port_222 + scalable_server_cmaui_3_test_nested3_test_nested2: + - test_nested2 + - scalable_server_cmaui_3_test_nested3 network.incoming.bytes.rate_cmaui_port_1: - cmaui_port_1 - network.incoming.bytes.rate network.incoming.bytes.rate_cmaui_port_2: - cmaui_port_2 - network.incoming.bytes.rate - disk.read.bytes.rate_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.read.bytes.rate_server_cmaui_test_nested3 - disk.device.read.bytes.rate_server_cmaui_test_nested3_test_nested2: + network.incoming.packets_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - disk.device.read.bytes.rate_server_cmaui_test_nested3 - disk.root.size_server_cmaui_test_nested2: - - test_nested2 - - disk.root.size_server_cmaui - memory.resident_server_cmaui_test_nested3_test_nested2: + - network.incoming.packets_cmaui_port_322_test_nested3 + vcpus_server_cmaui_1: + - server_cmaui_1 + - vcpus + disk.write.bytes_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - memory.resident_server_cmaui_test_nested3 - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests + - disk.write.bytes_server_cmaui_3_test_nested3 + disk.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes.rate network.outpoing.packets_cmaui_port_1: - cmaui_port_1 - network.outpoing.packets network.outpoing.packets_cmaui_port_2: - cmaui_port_2 - network.outpoing.packets - network.incoming.packets_cmaui_port_22_test_nested2: - - test_nested2 - - network.incoming.packets_cmaui_port_22 - network.incoming.bytes_cmaui_port_22_test_nested2: - - test_nested2 - - network.incoming.bytes_cmaui_port_22 - cpu.delta_server_cmaui_test_nested2: - - test_nested2 - - cpu.delta_server_cmaui - network.incoming.bytes_cmaui_port_11_test_nested3_test_nested2: - - test_nested2 - - network.incoming.bytes_cmaui_port_11_test_nested3 - network.outpoing.packets_cmaui_port_22_test_nested2: - - test_nested2 - - network.outpoing.packets_cmaui_port_22 - disk.device.write.requests_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - disk.device.write.requests_server_cmaui_test_nested3 - endpoint_server_cmaui: - - server_cmaui - - endpoint - feature_cmaui_port_11_test_nested2: - - test_nested2 - - feature_cmaui_port_11 - attachment_cmaui_port_11_test_nested2: + disk.device.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests + cpu.delta_server_cmaui_1: + - server_cmaui_1 + - cpu.delta + disk.write.bytes_server_cmaui_2_test_nested2: - test_nested2 - - attachment_cmaui_port_11 - network.outgoing.bytes.rate_cmaui_port_11_test_nested3_test_nested2: + - disk.write.bytes_server_cmaui_2 + cpu_util_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - network.outgoing.bytes.rate_cmaui_port_11_test_nested3 - disk.device.capacity_server_cmaui_test_nested2: + - cpu_util_server_cmaui_3_test_nested3 + disk.read.bytes.rate_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - disk.device.capacity_server_cmaui + - disk.read.bytes.rate_server_cmaui_3_test_nested3 + memory.resident_server_cmaui_1: + - server_cmaui_1 + - memory.resident + disk.latency_server_cmaui_1: + - server_cmaui_1 + - disk.latency + memory.usage_server_cmaui_1: + - server_cmaui_1 + - memory.usage requirements: - dependency_cmaui_port_22_test_nested2: - - test_nested2 - - dependency_cmaui_port_22 - dependency_server_cmaui: - - server_cmaui - - dependency - dependency_server_cmaui_test_nested2: + link_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - dependency_server_cmaui - link_cmaui_port_22_test_nested2: + - link_cmaui_port_311_test_nested3 + dependency_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - link_cmaui_port_22 - dependency_cmaui_port_22_test_nested3_test_nested2: + - dependency_cmaui_port_322_test_nested3 + link_cmaui_port_322_test_nested3_test_nested2: - test_nested2 - - dependency_cmaui_port_22_test_nested3 - dependency_cmaui_port_11_test_nested2: + - link_cmaui_port_322_test_nested3 + dependency_cmaui_port_222_test_nested2: - test_nested2 - - dependency_cmaui_port_11 + - dependency_cmaui_port_222 link_cmaui_port_2: - cmaui_port_2 - link link_cmaui_port_1: - cmaui_port_1 - link - dependency_cmaui_port_11_test_nested3_test_nested2: + dependency_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - dependency_cmaui_port_11_test_nested3 - local_storage_server_cmaui_test_nested2: + - dependency_server_cmaui_3_test_nested3 + dependency_cmaui_port_311_test_nested3_test_nested2: - test_nested2 - - local_storage_server_cmaui - dependency_server_cmaui_test_nested3_test_nested2: - - test_nested2 - - dependency_server_cmaui_test_nested3 - local_storage_server_cmaui: - - server_cmaui + - dependency_cmaui_port_311_test_nested3 + local_storage_server_cmaui_1: + - server_cmaui_1 - local_storage - link_cmaui_port_11_test_nested3_test_nested2: + dependency_server_cmaui_2_test_nested2: + - test_nested2 + - dependency_server_cmaui_2 + dependency_cmaui_port_211_test_nested2: - test_nested2 - - link_cmaui_port_11_test_nested3 + - dependency_cmaui_port_211 + local_storage_server_cmaui_2_test_nested2: + - test_nested2 + - local_storage_server_cmaui_2 dependency_test_nested2: - test_nested2 - dependency - link_cmaui_port_22_test_nested3_test_nested2: + local_storage_server_cmaui_3_test_nested3_test_nested2: - test_nested2 - - link_cmaui_port_22_test_nested3 + - local_storage_server_cmaui_3_test_nested3 dependency_cmaui_port_1: - cmaui_port_1 - dependency - local_storage_server_cmaui_test_nested3_test_nested2: + link_cmaui_port_222_test_nested2: - test_nested2 - - local_storage_server_cmaui_test_nested3 + - link_cmaui_port_222 dependency_test_nested3_test_nested2: - test_nested2 - dependency_test_nested3 - link_cmaui_port_11_test_nested2: - - test_nested2 - - link_cmaui_port_11 + dependency_server_cmaui_1: + - server_cmaui_1 + - dependency dependency_cmaui_port_2: - cmaui_port_2 - - dependency
\ No newline at end of file + - dependency + link_cmaui_port_211_test_nested2: + - test_nested2 + - link_cmaui_port_211
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml index b202fef7b0..b15724a17b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested.yml @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}] replacement_policy: AUTO - server_cmaui: + server_cmaui_1: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml index 14c137a884..66988681f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested2level.yml @@ -31,7 +31,7 @@ parameters: resources: - cmaui_port_11: + cmaui_port_211: type: OS::Neutron::Port properties: network: { get_param: net } @@ -39,7 +39,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}, {get_param: p2}] replacement_policy: AUTO - cmaui_port_22: + cmaui_port_222: type: OS::Neutron::Port properties: network: { get_param: net } @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}] replacement_policy: AUTO - server_cmaui: + server_cmaui_2: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -55,8 +55,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_11 } - - port: { get_resource: cmaui_port_22 } + - port: { get_resource: cmaui_port_211 } + - port: { get_resource: cmaui_port_222 } test_nested3: type: nested3level.yml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml index 6a123d1641..47fa4d37e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/inputs/nested3level.yml @@ -31,7 +31,7 @@ parameters: resources: - cmaui_port_11: + cmaui_port_311: type: OS::Neutron::Port properties: network: { get_param: net } @@ -39,7 +39,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}, {get_param: p2}] replacement_policy: AUTO - cmaui_port_22: + cmaui_port_322: type: OS::Neutron::Port properties: network: { get_param: net } @@ -47,7 +47,7 @@ resources: security_groups: [{get_param: shared_security_group_id1}] replacement_policy: AUTO - server_cmaui: + server_cmaui_3: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -55,5 +55,5 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_11 } - - port: { get_resource: cmaui_port_22 }
\ No newline at end of file + - port: { get_resource: cmaui_port_311 } + - port: { get_resource: cmaui_port_322 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 029052218e..435c42a81c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,14 +68,14 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -95,52 +95,45 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: + - dependency_network_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_network: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - capabilities: - network.incoming.packets.rate_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - link_pcm_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED + - 1 + capabilities: cpu_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_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. + feature_pcm_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1: + memory_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. occurrences: - 1 - UNBOUNDED - memory_server_pcm: + network.incoming.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -152,179 +145,176 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pcm: + network.incoming.packets_pcm_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. occurrences: - 1 - UNBOUNDED - memory.resident_server_pcm: + disk.device.iops_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + memory.resident_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. occurrences: - 1 - UNBOUNDED - disk.device.usage_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. + attachment_network_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + disk.device.write.requests_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. occurrences: - 1 - UNBOUNDED - disk.usage_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. + feature_network_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_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. occurrences: - 1 - UNBOUNDED - disk.root.size_server_pcm: + network.incoming.bytes_pcm_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. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm: + network.incoming.bytes_pcm_port_01: type: org.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_pcm: + disk.device.usage_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + disk.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_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. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - memory.usage_server_pcm: + disk.usage_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. occurrences: - 1 - UNBOUNDED - disk.read.requests_server_pcm: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - link_network: - type: tosca.capabilities.network.Linkable + network.outgoing.bytes_pcm_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. occurrences: - 1 - UNBOUNDED - disk.capacity_server_pcm: + disk.root.size_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. occurrences: - 1 - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem + disk.ephemeral.size_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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: + disk.device.latency_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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + network.outgoing.packets.rate_pcm_port_01: type: org.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_pcm_port_1: + memory.usage_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. occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node + network.outgoing.bytes_pcm_port_01: + type: org.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_pcm_port_0: + disk.read.requests_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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pcm: + disk.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. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + os_server_pcm: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + disk.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. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + link_network_2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + 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. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pcm_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. occurrences: - 1 - UNBOUNDED @@ -333,14 +323,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + network.incoming.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - end_point_network: - type: tosca.capabilities.Endpoint + disk.device.read.requests.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. occurrences: - 1 - UNBOUNDED @@ -350,11 +341,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_network: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.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. @@ -384,78 +370,87 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_network: - type: tosca.capabilities.Node + disk.device.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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + cpu_util_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. occurrences: - 1 - UNBOUNDED - cpu_util_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.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_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.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_pcm: + network.incoming.packets.rate_pcm_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. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - cpu.delta_server_pcm: + disk.write.requests.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_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. + binding_pcm_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_pcm_port_0: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + host_server_pcm: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.outgoing.bytes.rate_pcm_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. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + cpu.delta_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. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_1: + binding_server_pcm: + type: tosca.capabilities.network.Bindable + 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. occurrences: @@ -490,7 +485,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + network.outpoing.packets_pcm_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. occurrences: @@ -502,7 +497,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + end_point_network_2: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -605,20 +605,13 @@ node_types: occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - dependency_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -626,14 +619,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_1_server_pcm_005: + - dependency_pcm_port_00_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1_server_pcm_005: + - link_pcm_port_00_server_pcm_005: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -653,26 +646,40 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0_server_pcm_005: + - dependency_network_2_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0_server_pcm_005: + - dependency_pcm_port_01_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pcm_port_01_server_pcm_005: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_network_server_pcm_005: + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - local_storage_server_pcm_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -686,14 +693,13 @@ node_types: occurrences: - 1 - 1 - - dependency_network: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + capabilities: + network.incoming.bytes.rate_pcm_port_01_server_pcm_005: + 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 - capabilities: network.incoming.packets.rate_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -717,73 +723,48 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_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. - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pcm_port_0: type: org.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_pcm_server_pcm_005: - type: org.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_pcm_port_1_server_pcm_005: + network.outgoing.bytes_pcm_port_01_server_pcm_005: type: org.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_pcm: + disk.device.write.bytes_server_pcm_server_pcm_005: type: org.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_pcm_port_1_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - link_network_server_pcm_005: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED memory_server_pcm_server_pcm_005: type: org.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_pcm_port_1_server_pcm_005: + disk.capacity_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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + network.incoming.packets.rate_pcm_port_00_server_pcm_005: type: org.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_pcm_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_network_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1_server_pcm_005: + disk.device.read.requests.rate_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -794,17 +775,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_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. - occurrences: - - 1 - - UNBOUNDED disk.read.bytes_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -817,31 +787,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_pcm: + network.incoming.bytes_pcm_port_0: type: org.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_pcm_port_0_server_pcm_005: + disk.write.requests_server_pcm_server_pcm_005: type: org.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_pcm: + disk.usage_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + vcpus_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. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pcm_server_pcm_005: + memory.resident_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. occurrences: @@ -873,24 +843,6 @@ node_types: occurrences: - 0 - UNBOUNDED - memory.usage_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_pcm_port_1_server_pcm_005: - type: org.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_pcm: - type: org.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_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -903,27 +855,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.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. + binding_pcm_port_00_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_pcm_port_0_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + link_network_1: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + disk.device.latency_server_pcm_server_pcm_005: type: org.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_pcm_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -939,18 +890,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node + link_network_2_server_pcm_005: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pcm: + network.outgoing.bytes_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -961,12 +911,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Node + disk.device.read.requests_server_pcm_server_pcm_005: + type: org.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_pcm_server_pcm_005: + cpu_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. occurrences: @@ -988,18 +939,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.usage_server_pcm_server_pcm_005: type: org.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_pcm: + network.outgoing.bytes_pcm_port_00_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1011,18 +957,25 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_server_pcm: + endpoint_server_pcm_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_01_server_pcm_005: type: org.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_network: - type: tosca.capabilities.Attachment + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + disk.device.capacity_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. occurrences: @@ -1034,66 +987,68 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pcm: + disk.allocation_server_pcm_server_pcm_005: type: org.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_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_pcm_port_00_server_pcm_005: + type: org.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_pcm: + disk.latency_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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm_server_pcm_005: + vcpus_server_pcm_server_pcm_005: type: org.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_pcm: - type: tosca.capabilities.Scalable + disk.write.requests.rate_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. occurrences: - 1 - UNBOUNDED - feature_network: - type: tosca.capabilities.Node + attachment_pcm_port_01_server_pcm_005: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu_util_server_pcm: + memory_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. occurrences: - 1 - UNBOUNDED - vcpus_server_pcm_server_pcm_005: + network.incoming.packets_pcm_port_00_server_pcm_005: type: org.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_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes_pcm_port_00_server_pcm_005: + type: org.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_pcm: + network.outpoing.packets_pcm_port_00_server_pcm_005: type: org.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_pcm: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED @@ -1103,60 +1058,59 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + disk.usage_server_pcm_server_pcm_005: type: org.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_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm_server_pcm_005: + network.outgoing.packets.rate_pcm_port_01_server_pcm_005: type: org.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_pcm: + instance_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. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_pcm: + disk.device.read.requests.rate_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. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1_server_pcm_005: + cpu_util_server_pcm_server_pcm_005: type: org.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_pcm_server_pcm_005: + disk.ephemeral.size_server_pcm_server_pcm_005: type: org.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_pcm: - type: tosca.capabilities.Node + end_point_network_1: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + disk.write.bytes.rate_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. occurrences: @@ -1168,7 +1122,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0_server_pcm_005: + disk.device.allocation_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. occurrences: @@ -1180,12 +1134,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_network_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: + disk.root.size_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. occurrences: @@ -1197,12 +1146,6 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_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. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1216,9 +1159,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_network_2_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_01_server_pcm_005: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1238,21 +1185,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pcm: + cpu_server_pcm_server_pcm_005: type: org.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_pcm_server_pcm_005: + binding_pcm_port_01_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.iops_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. occurrences: - 1 - UNBOUNDED - memory.resident_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. + feature_network_2_server_pcm_005: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1262,15 +1215,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + disk.device.write.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.usage_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. + attachment_network_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_00_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + end_point_network_2_server_pcm_005: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED @@ -1279,37 +1241,39 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + disk.write.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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0_server_pcm_005: + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm: + cpu_util_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. occurrences: - 1 - UNBOUNDED - link_network: - type: tosca.capabilities.network.Linkable + disk.allocation_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. occurrences: - 1 - UNBOUNDED - disk.capacity_server_pcm: + disk.device.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. occurrences: - 1 - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem + memory.usage_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. occurrences: - 1 - UNBOUNDED @@ -1319,23 +1283,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_0_server_pcm_005: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + disk.device.write.requests_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - end_point_network: - type: tosca.capabilities.Endpoint + disk.read.bytes.rate_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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm_server_pcm_005: + disk.device.iops_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. occurrences: @@ -1347,61 +1313,76 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_pcm: + disk.device.capacity_server_pcm_server_pcm_005: type: org.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_pcm_server_pcm_005: + cpu.delta_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1_server_pcm_005: + network.outpoing.packets_pcm_port_01_server_pcm_005: type: org.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_pcm_port_0_server_pcm_005: + network.incoming.bytes.rate_pcm_port_00_server_pcm_005: type: org.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_pcm_server_pcm_005: + 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. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_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. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_00_server_pcm_005: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + disk.ephemeral.size_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. occurrences: - 1 - UNBOUNDED + feature_server_pcm_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_pcm_server_pcm_005: type: org.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_pcm_port_0_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01_server_pcm_005: type: org.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_pcm: + network.outgoing.packets.rate_pcm_port_00_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1413,24 +1394,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_1_server_pcm_005: + disk.device.latency_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. occurrences: - 1 - UNBOUNDED - attachment_network_server_pcm_005: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_pcm_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.rate_pcm_port_1: + network.incoming.packets_pcm_port_0: type: org.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_pcm_port_0: + disk.device.usage_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. occurrences: @@ -1442,8 +1424,9 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_network_server_pcm_005: - type: tosca.capabilities.Endpoint + disk.device.write.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. occurrences: - 1 - UNBOUNDED @@ -1459,12 +1442,29 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pcm: + network.incoming.bytes_pcm_port_01_server_pcm_005: type: org.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_pcm_port_01_server_pcm_005: + type: org.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_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. + occurrences: + - 1 + - UNBOUNDED + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_pcm_server_pcm_005: 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/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 480a645fdf..a1c67fba97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -125,21 +125,13 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.nodes.heat.pcm_server + network_1: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name + network_name: + get_input: cps_net_name server_pcm_005: type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 directives: @@ -163,6 +155,19 @@ topology_template: get_input: cps_net_name cps_net_mask: get_input: cps_net_mask + server_pcm_1: + type: org.openecomp.resource.vfc.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -186,13 +191,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - network: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: cps_net_name groups: nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack @@ -201,17 +201,20 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - pcm_port_1 - - server_pcm + - network_1 - server_pcm_005 + - server_pcm_1 - pcm_port_0 - - network outputs: server_pcm_id: description: the pcm nova service id - value: server_pcm + value: server_pcm_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: + network.incoming.bytes.rate_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes.rate_pcm_port_01 network.incoming.packets.rate_pcm_port_0: - pcm_port_0 - network.incoming.packets.rate @@ -224,72 +227,54 @@ topology_template: network.outpoing.packets_pcm_port_1: - pcm_port_1 - network.outpoing.packets - memory_server_pcm: - - server_pcm - - memory network.outpoing.packets_pcm_port_0: - pcm_port_0 - network.outpoing.packets + network.outgoing.bytes_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_01 disk.device.write.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.bytes_server_pcm - network.incoming.bytes.rate_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.bytes.rate_pcm_port_1 - disk.device.iops_server_pcm: - - server_pcm - - disk.device.iops - binding_pcm_port_1_server_pcm_005: - - server_pcm_005 - - binding_pcm_port_1 - link_network_server_pcm_005: - - server_pcm_005 - - link_network memory_server_pcm_server_pcm_005: - server_pcm_005 - memory_server_pcm - network.outgoing.packets.rate_pcm_port_1_server_pcm_005: + disk.capacity_server_pcm_1: + - server_pcm_1 + - disk.capacity + network.incoming.packets.rate_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.outgoing.packets.rate_pcm_port_1 - disk.allocation_server_pcm: - - server_pcm - - disk.allocation + - network.incoming.packets.rate_pcm_port_00 + feature_network_1: + - network_1 + - feature disk.device.read.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.requests.rate_server_pcm - network.outgoing.bytes_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes_pcm_port_1 os_server_pcm_server_pcm_005: - server_pcm_005 - os_server_pcm - feature_pcm_port_0_server_pcm_005: - - server_pcm_005 - - feature_pcm_port_0 - disk.usage_server_pcm: - - server_pcm - - disk.usage disk.read.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.bytes_server_pcm disk.device.write.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.bytes.rate_server_pcm - disk.root.size_server_pcm: - - server_pcm - - disk.root.size - network.incoming.packets_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.packets_pcm_port_0 - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency network.incoming.bytes_pcm_port_0: - pcm_port_0 - network.incoming.bytes disk.write.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.requests_server_pcm + disk.usage_server_pcm_1: + - server_pcm_1 + - disk.usage + vcpus_server_pcm_1: + - server_pcm_1 + - vcpus + memory.resident_server_pcm_1: + - server_pcm_1 + - memory.resident network.incoming.bytes_pcm_port_1: - pcm_port_1 - network.incoming.bytes @@ -302,57 +287,48 @@ topology_template: binding_pcm_port_1: - pcm_port_1 - binding - memory.usage_server_pcm: - - server_pcm - - memory.usage - network.incoming.packets.rate_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.packets.rate_pcm_port_1 - disk.read.requests_server_pcm: - - server_pcm - - disk.read.requests disk.iops_server_pcm_server_pcm_005: - server_pcm_005 - disk.iops_server_pcm disk.device.read.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.bytes.rate_server_pcm - disk.read.bytes_server_pcm: - - server_pcm - - disk.read.bytes - network.outgoing.bytes_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes_pcm_port_0 - network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + binding_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.outgoing.bytes.rate_pcm_port_1 + - binding_pcm_port_00 + link_network_1: + - network_1 + - link disk.device.latency_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.latency_server_pcm + feature_server_pcm_1: + - server_pcm_1 + - feature network.outgoing.packets.rate_pcm_port_0: - pcm_port_0 - network.outgoing.packets.rate network.outgoing.packets.rate_pcm_port_1: - pcm_port_1 - network.outgoing.packets.rate + link_network_2_server_pcm_005: + - server_pcm_005 + - link_network_2 feature_pcm_port_1: - pcm_port_1 - feature network.outgoing.bytes_pcm_port_0: - pcm_port_0 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes feature_pcm_port_0: - pcm_port_0 - feature - feature_pcm_port_1_server_pcm_005: - - server_pcm_005 - - feature_pcm_port_1 disk.device.read.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.requests_server_pcm + cpu_server_pcm_1: + - server_pcm_1 + - cpu network.outgoing.bytes_pcm_port_1: - pcm_port_1 - network.outgoing.bytes @@ -362,126 +338,123 @@ topology_template: attachment_pcm_port_1: - pcm_port_1 - attachment - attachment_pcm_port_1_server_pcm_005: - - server_pcm_005 - - attachment_pcm_port_1 disk.device.usage_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.usage_server_pcm - disk.device.read.requests.rate_server_pcm: - - server_pcm - - disk.device.read.requests.rate + network.outgoing.bytes_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_00 disk.read.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.requests_server_pcm - vcpus_server_pcm: - - server_pcm - - vcpus - attachment_network: - - network - - attachment - disk.write.bytes_server_pcm: - - server_pcm - - disk.write.bytes + endpoint_server_pcm_1: + - server_pcm_1 + - endpoint + network.incoming.packets.rate_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.packets.rate_pcm_port_01 + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 + - disk.device.capacity disk.write.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.bytes.rate_server_pcm - disk.read.bytes.rate_server_pcm: - - server_pcm - - disk.read.bytes.rate - attachment_pcm_port_0_server_pcm_005: - - server_pcm_005 - - attachment_pcm_port_0 - disk.device.allocation_server_pcm: - - server_pcm - - disk.device.allocation disk.allocation_server_pcm_server_pcm_005: - server_pcm_005 - disk.allocation_server_pcm - scalable_server_pcm: - - server_pcm - - scalable - feature_network: - - network - - feature - cpu_util_server_pcm: - - server_pcm - - cpu_util + network.outgoing.bytes.rate_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes.rate_pcm_port_00 + disk.latency_server_pcm_1: + - server_pcm_1 + - disk.latency vcpus_server_pcm_server_pcm_005: - server_pcm_005 - vcpus_server_pcm - host_server_pcm: - - server_pcm - - host - cpu.delta_server_pcm: - - server_pcm - - cpu.delta - binding_server_pcm: - - server_pcm - - binding + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.write.requests.rate + attachment_pcm_port_01_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_01 + memory_server_pcm_1: + - server_pcm_1 + - memory + network.incoming.packets_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_00 + network.incoming.bytes_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_00 + network.outpoing.packets_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outpoing.packets_pcm_port_00 + disk.device.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes.rate disk.write.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.bytes_server_pcm - disk.device.capacity_server_pcm: - - server_pcm - - disk.device.capacity - disk.device.write.requests.rate_server_pcm: - - server_pcm - - disk.device.write.requests.rate disk.usage_server_pcm_server_pcm_005: - server_pcm_005 - disk.usage_server_pcm - disk.latency_server_pcm: - - server_pcm - - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm - - disk.device.read.requests - network.outpoing.packets_pcm_port_1_server_pcm_005: + disk.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.write.bytes + network.outgoing.packets.rate_pcm_port_01_server_pcm_005: - server_pcm_005 - - network.outpoing.packets_pcm_port_1 + - network.outgoing.packets.rate_pcm_port_01 + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate cpu_util_server_pcm_server_pcm_005: - server_pcm_005 - cpu_util_server_pcm - feature_server_pcm: - - server_pcm - - feature disk.ephemeral.size_server_pcm_server_pcm_005: - server_pcm_005 - disk.ephemeral.size_server_pcm - disk.write.bytes.rate_server_pcm: - - server_pcm + end_point_network_1: + - network_1 + - end_point + binding_server_pcm_1: + - server_pcm_1 + - binding + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate memory.resident_server_pcm_server_pcm_005: - server_pcm_005 - memory.resident_server_pcm - network.incoming.bytes_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.bytes_pcm_port_0 + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation disk.capacity_server_pcm_server_pcm_005: - server_pcm_005 - disk.capacity_server_pcm - feature_network_server_pcm_005: - - server_pcm_005 - - feature_network - network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes.rate_pcm_port_0 + disk.root.size_server_pcm_1: + - server_pcm_1 + - disk.root.size disk.latency_server_pcm_server_pcm_005: - server_pcm_005 - disk.latency_server_pcm - cpu_server_pcm: - - server_pcm - - cpu disk.write.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.requests.rate_server_pcm host_server_pcm_server_pcm_005: - server_pcm_005 - host_server_pcm - network.outpoing.packets_pcm_port_0_server_pcm_005: + attachment_network_2_server_pcm_005: + - server_pcm_005 + - attachment_network_2 + feature_pcm_port_01_server_pcm_005: - server_pcm_005 - - network.outpoing.packets_pcm_port_0 + - feature_pcm_port_01 disk.read.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.bytes.rate_server_pcm @@ -491,123 +464,150 @@ topology_template: endpoint_server_pcm_server_pcm_005: - server_pcm_005 - endpoint_server_pcm - disk.write.requests_server_pcm: - - server_pcm - - disk.write.requests cpu_server_pcm_server_pcm_005: - server_pcm_005 - cpu_server_pcm - memory.resident_server_pcm: - - server_pcm - - memory.resident + binding_pcm_port_01_server_pcm_005: + - server_pcm_005 + - binding_pcm_port_01 + disk.iops_server_pcm_1: + - server_pcm_1 + - disk.iops + feature_network_2_server_pcm_005: + - server_pcm_005 + - feature_network_2 disk.device.read.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.bytes_server_pcm - disk.device.write.requests_server_pcm: - - server_pcm - - disk.device.write.requests - disk.device.usage_server_pcm: - - server_pcm - - disk.device.usage + disk.device.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes.rate + attachment_network_1: + - network_1 + - attachment + attachment_pcm_port_00_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_00 + end_point_network_2_server_pcm_005: + - server_pcm_005 + - end_point_network_2 feature_server_pcm_005: - server_pcm_005 - feature - disk.device.write.bytes_server_pcm: - - server_pcm + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + disk.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.read.bytes + cpu_util_server_pcm_1: + - server_pcm_1 + - cpu_util + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 - disk.device.write.bytes - network.outgoing.packets.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.packets.rate_pcm_port_0 - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - link_network: - - network - - link - disk.capacity_server_pcm: - - server_pcm - - disk.capacity - os_server_pcm: - - server_pcm - - os + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage memory.usage_server_pcm_server_pcm_005: - server_pcm_005 - memory.usage_server_pcm - network.incoming.packets.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.packets.rate_pcm_port_0 - endpoint_server_pcm: - - server_pcm - - endpoint - end_point_network: - - network - - end_point + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes disk.device.write.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.requests_server_pcm + disk.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.read.bytes.rate + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops disk.device.iops_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.iops_server_pcm - disk.iops_server_pcm: - - server_pcm - - disk.iops disk.device.capacity_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.capacity_server_pcm - network.incoming.bytes_pcm_port_1_server_pcm_005: + cpu.delta_server_pcm_1: + - server_pcm_1 + - cpu.delta + network.outpoing.packets_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.outpoing.packets_pcm_port_01 + network.incoming.bytes.rate_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.incoming.bytes_pcm_port_1 - network.incoming.bytes.rate_pcm_port_0_server_pcm_005: + - network.incoming.bytes.rate_pcm_port_00 + disk.read.requests_server_pcm_1: + - server_pcm_1 + - disk.read.requests + disk.device.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests.rate + feature_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.incoming.bytes.rate_pcm_port_0 + - feature_pcm_port_00 + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size feature_server_pcm_server_pcm_005: - server_pcm_005 - feature_server_pcm - disk.device.read.bytes.rate_server_pcm: - - server_pcm - - disk.device.read.bytes.rate disk.device.write.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.requests.rate_server_pcm - binding_pcm_port_0_server_pcm_005: + scalable_server_pcm_1: + - server_pcm_1 + - scalable + network.outgoing.bytes.rate_pcm_port_01_server_pcm_005: - server_pcm_005 - - binding_pcm_port_0 - disk.write.requests.rate_server_pcm: - - server_pcm - - disk.write.requests.rate - disk.device.write.bytes.rate_server_pcm: - - server_pcm - - disk.device.write.bytes.rate + - network.outgoing.bytes.rate_pcm_port_01 + network.outgoing.packets.rate_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.packets.rate_pcm_port_00 disk.device.allocation_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.allocation_server_pcm - network.incoming.packets_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.packets_pcm_port_1 - attachment_network_server_pcm_005: - - server_pcm_005 - - attachment_network + disk.device.latency_server_pcm_1: + - server_pcm_1 + - disk.device.latency network.outgoing.bytes.rate_pcm_port_1: - pcm_port_1 - network.outgoing.bytes.rate network.incoming.packets_pcm_port_0: - pcm_port_0 - network.incoming.packets + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - network.outgoing.bytes.rate - end_point_network_server_pcm_005: - - server_pcm_005 - - end_point_network + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests network.incoming.packets_pcm_port_1: - pcm_port_1 - network.incoming.packets disk.root.size_server_pcm_server_pcm_005: - server_pcm_005 - disk.root.size_server_pcm - instance_server_pcm: - - server_pcm - - instance + network.incoming.bytes_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_01 + network.incoming.packets_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_01 + disk.device.read.requests_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests + os_server_pcm_1: + - server_pcm_1 + - os cpu.delta_server_pcm_server_pcm_005: - server_pcm_005 - cpu.delta_server_pcm @@ -621,45 +621,45 @@ topology_template: dependency_server_pcm_005: - server_pcm_005 - dependency - link_pcm_port_1_server_pcm_005: + dependency_network_2_server_pcm_005: - server_pcm_005 - - link_pcm_port_1 - dependency_pcm_port_1_server_pcm_005: + - dependency_network_2 + dependency_pcm_port_01_server_pcm_005: - server_pcm_005 - - dependency_pcm_port_1 - local_storage_server_pcm: - - server_pcm - - local_storage - dependency_pcm_port_0_server_pcm_005: - - server_pcm_005 - - dependency_pcm_port_0 + - dependency_pcm_port_01 dependency_pcm_port_0: - pcm_port_0 - dependency - dependency_server_pcm: - - server_pcm - - dependency local_storage_server_pcm_server_pcm_005: - server_pcm_005 - local_storage_server_pcm dependency_pcm_port_1: - pcm_port_1 - dependency + link_pcm_port_00_server_pcm_005: + - server_pcm_005 + - link_pcm_port_00 dependency_server_pcm_server_pcm_005: - server_pcm_005 - dependency_server_pcm + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage link_pcm_port_0: - pcm_port_0 - link link_pcm_port_1: - pcm_port_1 - link - dependency_network: - - network - - dependency - link_pcm_port_0_server_pcm_005: + dependency_pcm_port_00_server_pcm_005: - server_pcm_005 - - link_pcm_port_0 - dependency_network_server_pcm_005: + - dependency_pcm_port_00 + dependency_server_pcm_1: + - server_pcm_1 + - dependency + dependency_network_1: + - network_1 + - dependency + link_pcm_port_01_server_pcm_005: - server_pcm_005 - - dependency_network
\ No newline at end of file + - link_pcm_port_01
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 16b003af18..806d12ea62 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -76,7 +76,7 @@ topology_template: type: string description: OAM network name node_templates: - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -89,13 +89,13 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: oam + network_role_tag: cps network: - get_input: oam_net_name + get_input: cps_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -114,7 +114,12 @@ topology_template: user_data_format: RAW name: get_input: pcm_server_name - pcm_port_0: + network_2: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: cps_net_name + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -127,23 +132,18 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: cps + network_role_tag: oam network: - get_input: cps_net_name + get_input: oam_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pcm relationship: tosca.relationships.network.BindsTo - network: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: cps_net_name groups: nested-pcm_v0.1_2_group: type: org.openecomp.groups.heat.HeatStack @@ -151,10 +151,10 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1_2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 + - pcm_port_00 - server_pcm - - pcm_port_0 - - network + - network_2 + - pcm_port_01 outputs: server_pcm_id: description: the pcm nova service id @@ -162,48 +162,72 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate cpu_server_pcm: - server_pcm - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets + feature_pcm_port_00: + - pcm_port_00 + - feature memory_server_pcm: - server_pcm - memory + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets disk.write.requests_server_pcm: - server_pcm - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets disk.device.iops_server_pcm: - server_pcm - disk.device.iops memory.resident_server_pcm: - server_pcm - memory.resident + attachment_network_2: + - network_2 + - attachment disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + feature_network_2: + - network_2 + - feature + network.outgoing.packets.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.packets.rate + network.incoming.bytes_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes + network.incoming.bytes_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + attachment_pcm_port_00: + - pcm_port_00 + - attachment + attachment_pcm_port_01: + - pcm_port_01 + - attachment disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes disk.root.size_server_pcm: - server_pcm - disk.root.size @@ -213,27 +237,18 @@ topology_template: disk.device.latency_server_pcm: - server_pcm - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests - link_network: - - network - - link disk.capacity_server_pcm: - server_pcm - disk.capacity @@ -243,48 +258,27 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes + link_network_2: + - network_2 + - link disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 - - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate - end_point_network: - - network - - end_point vcpus_server_pcm: - server_pcm - vcpus - attachment_network: - - network - - attachment disk.write.bytes_server_pcm: - server_pcm - disk.write.bytes @@ -300,45 +294,48 @@ topology_template: scalable_server_pcm: - server_pcm - scalable - feature_network: - - network - - feature disk.device.read.bytes.rate_server_pcm: - server_pcm - disk.device.read.bytes.rate cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.packets.rate + network.incoming.packets.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.packets.rate + binding_pcm_port_01: + - pcm_port_01 + - binding disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_00: + - pcm_port_00 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate host_server_pcm: - server_pcm - host + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes.rate cpu.delta_server_pcm: - server_pcm - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets binding_server_pcm: - server_pcm - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets instance_server_pcm: - server_pcm - instance @@ -354,34 +351,37 @@ topology_template: feature_server_pcm: - server_pcm - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_00: + - pcm_port_00 + - network.outpoing.packets disk.write.bytes.rate_server_pcm: - server_pcm - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + end_point_network_2: + - network_2 + - end_point + network.outpoing.packets_pcm_port_01: + - pcm_port_01 + - network.outpoing.packets requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link - dependency_network: - - network + dependency_pcm_port_00: + - pcm_port_00 - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_01: + - pcm_port_01 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_00: + - pcm_port_00 + - link dependency_server_pcm: - server_pcm - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_network_2: + - network_2 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml index 66a03796fb..61c1944bc7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml @@ -78,21 +78,21 @@ resources: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_1} - config: { get_resource: script_init} script_init: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_1} - network: + network_1: type: OS::Contrail::VirtualNetwork properties: name: { get_param: cps_net_name} - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -126,13 +126,7 @@ resources: - ip_address: { get_param: oam_net_ip } security_groups: [{ get_param: security_group_name }] - #pcm_vol_attachment: - # type: OS::Cinder::VolumeAttachment - # properties: - # volume_id: { get_param: pcm_vol } - # mountpoint: /dev/vdb - # instance_uuid: { get_resource: server_pcm } outputs: server_pcm_id: description: the pcm nova service id - value: { get_resource: server_pcm }
\ No newline at end of file + value: { get_resource: server_pcm_1 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml index 11be0dd63b..5f44c88c80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml @@ -50,16 +50,16 @@ resources: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_2} - config: { get_resource: script_init} script_init: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_2} - network: + network_2: type: OS::Contrail::VirtualNetwork properties: name: { get_param: cps_net_name} @@ -73,8 +73,8 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_port_00} + - port: { get_resource: pcm_port_01} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -82,7 +82,7 @@ resources: user_data: get_resource: server_init - pcm_port_0: + pcm_port_00: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -90,7 +90,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } |