diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels')
5 files changed, 694 insertions, 694 deletions
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]} |